You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2020/06/17 22:07:10 UTC
[GitHub] [incubator-nuttx] davids5 opened a new pull request #1270: Makefile.unix:versioning insure it is a .git dir
davids5 opened a new pull request #1270:
URL: https://github.com/apache/incubator-nuttx/pull/1270
## Summary
An out-of-tree build may have a .git file that is from a submodule. Once we find a .git, we need check if this is really a working dir.
## Impact
The tools/version was being passes values that imply the directory is a working dir when it is not.
It this uses git operations that will fail.
## Testing
built in nuttx master and out of tree in a submodule. Both now work.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #1270: Makefile.unix:versioning insure it is a .git dir
Posted by GitBox <gi...@apache.org>.
davids5 commented on a change in pull request #1270:
URL: https://github.com/apache/incubator-nuttx/pull/1270#discussion_r442194428
##########
File path: tools/Makefile.unix
##########
@@ -25,9 +25,13 @@ include $(TOPDIR)/Make.defs
GIT_DIR = $(if $(wildcard $(TOPDIR)$(DELIM).git),y,)
+ifeq ($(GIT_DIR),y)
+GIT_PRESENT = `git rev-parse --git-dir 2> /dev/null`
+endif
+
Review comment:
I thought the same thing, but they diverged at some point.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #1270: Makefile.unix:versioning insure it is a .git dir
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #1270:
URL: https://github.com/apache/incubator-nuttx/pull/1270
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo commented on a change in pull request #1270: Makefile.unix:versioning insure it is a .git dir
Posted by GitBox <gi...@apache.org>.
patacongo commented on a change in pull request #1270:
URL: https://github.com/apache/incubator-nuttx/pull/1270#discussion_r441938255
##########
File path: tools/Makefile.unix
##########
@@ -25,9 +25,13 @@ include $(TOPDIR)/Make.defs
GIT_DIR = $(if $(wildcard $(TOPDIR)$(DELIM).git),y,)
+ifeq ($(GIT_DIR),y)
+GIT_PRESENT = `git rev-parse --git-dir 2> /dev/null`
+endif
+
Review comment:
Doesn't Makefile.win need this change as well?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #1270: Makefile.unix:versioning insure it is a .git dir
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #1270:
URL: https://github.com/apache/incubator-nuttx/pull/1270#discussion_r441945135
##########
File path: tools/Makefile.unix
##########
@@ -25,9 +25,13 @@ include $(TOPDIR)/Make.defs
GIT_DIR = $(if $(wildcard $(TOPDIR)$(DELIM).git),y,)
+ifeq ($(GIT_DIR),y)
+GIT_PRESENT = `git rev-parse --git-dir 2> /dev/null`
+endif
+
Review comment:
I have the same question before, but Makefile.win don't generate version info from git history like Makefile.unix.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org