{"thread":{"id":"4238","subject":"[PATCH] Change GIT-VERSION-GEN to call git commands with \"git\" not \"git-\".","startedAt":"2006-05-22T04:39:52Z","lastAt":"2006-05-23T01:20:37Z","messageCount":3,"participants":["Sean","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"20422","messageId":"BAYC1-PASMTP09B22AA86724B4F2C01F7FAE9A0@CEZ.ICE","threadId":"4238","inReplyTo":null,"subject":"[PATCH] Change GIT-VERSION-GEN to call git commands with \"git\" not \"git-\".","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2006-05-22T04:39:52Z","receivedAt":"2006-05-22T04:39:52Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nGIT-VERSION-GEN can incorrectly return a default version of\n\"v1.3.GIT\" because it tries to execute git commands using the\n\"git-cmd\" format that expects all git commands to be in the $PATH.\nConvert these to  \"git cmd\" format so that a proper answer is\nreturned even when the git commands have been moved out of the\n$PATH and into a $gitexecdir.\n---\n GIT-VERSION-GEN |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN\nindex 7fcefcd..a461518 100755\n--- a/GIT-VERSION-GEN\n+++ b/GIT-VERSION-GEN\n@@ -5,7 +5,7 @@ DEF_VER=v1.3.GIT\n \n # First try git-describe, then see if there is a version file\n # (included in release tarballs), then default\n-if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then\n+if VN=$(git describe --abbrev=4 HEAD 2>/dev/null); then\n \tVN=$(echo \"$VN\" | sed -e 's/-/./g');\n elif test -f version\n then\n@@ -16,7 +16,7 @@ fi\n \n VN=$(expr \"$VN\" : v*'\\(.*\\)')\n \n-dirty=$(sh -c 'git-diff-index --name-only HEAD' 2>/dev/null) || dirty=\n+dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=\n case \"$dirty\" in\n '')\n \t;;\n-- \n1.3.3.ge95c\n"},{"id":"20423","messageId":"BAYC1-PASMTP07C5BAC47CC7E8CF750B26AE9A0@CEZ.ICE","threadId":"4238","inReplyTo":"BAYC1-PASMTP09B22AA86724B4F2C01F7FAE9A0@CEZ.ICE","subject":"[PATCH] Install git builtins into gitexecdir rather than bindir.","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2006-05-22T04:42:59Z","receivedAt":"2006-05-22T04:42:59Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nMoving \"git-cmd\" commands out of the path and into a special\ngit exec path, should include the builtins.\n---\n Makefile |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex d171829..d9b9671 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -628,7 +628,8 @@ install: all\n \t$(MAKE) -C templates install\n \t$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'\n \t$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'\n-\t$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(bindir_SQ)/$p' && ln '$(DESTDIR_SQ)$(bindir_SQ)/git$X' '$(DESTDIR_SQ)$(bindir_SQ)/$p' ;)\n+\tln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' || cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'\n+\t$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)\n \n install-doc:\n \t$(MAKE) -C Documentation install\n-- \n1.3.3.ge95c\n"},{"id":"20503","messageId":"7vpsi58rkq.fsf@assigned-by-dhcp.cox.net","threadId":"4238","inReplyTo":"BAYC1-PASMTP09B22AA86724B4F2C01F7FAE9A0@CEZ.ICE","subject":"Re: [PATCH] Change GIT-VERSION-GEN to call git commands with \"git\" not \"git-\".","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-05-23T01:20:37Z","receivedAt":"2006-05-23T01:20:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sean <seanlkml@sympatico.ca> writes:\n\n> GIT-VERSION-GEN can incorrectly return a default version of\n> \"v1.3.GIT\" because it tries to execute git commands using the\n> \"git-cmd\" format that expects all git commands to be in the $PATH.\n> Convert these to  \"git cmd\" format so that a proper answer is\n> returned even when the git commands have been moved out of the\n> $PATH and into a $gitexecdir.\n\nIIRC, the reason we spelled it as \"git-describe\"\nwith a dash is ancient git wrapper said \"not a git command\" when\ngiven \"describe\" which it did not understand without failing.\n\nI think it has been long enough since we introduced \"git describe\",\nso this would be OK. \n"}]}