[PATCH] use "git <command>" instead of "git-<command>"

[PATCH] use "git <command>" instead of "git-<command>"

[Uwe Zeisberger]

Hello,

Otherwise installations with gitexecdir != bindir are not able to determine the
right version.

---

 GIT-VERSION-GEN |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

9d9d610164ec140f3fee21475b976d3e4b998991
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e3cd9fa..2085ad3 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,13 +5,13 @@ DEF_VER=v1.1.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
-VN=$(git-describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
+VN=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
 VN=$(cat version) ||
 VN="$DEF_VER"
 
 VN=$(expr "$VN" : v*'\(.*\)')
 
-dirty=$(sh -c 'git-diff-index --name-only HEAD' 2>/dev/null) || dirty=
+dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
 case "$dirty" in
 '')
 	;;
-- 
1.1.4.g2eaa

Best regards
Uwe

-- 
Uwe Zeisberger

http://www.google.com/search?q=1+year+divided+by+3+in+seconds

Re: [PATCH] use "git <command>" instead of "git-<command>"

[Junio C Hamano]

Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> writes:

> Otherwise installations with gitexecdir != bindir are not able
> to determine the right version.

True, but this part

> -VN=$(git-describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
> +VN=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
>...

has a subtle issue, which the commit 026351a addresses, which
will hopefully become a non-issue given enough time.  Then it
would be safe to make this change.

Of course, if/when I change the main Makefile to have different
gitexecdir and bindir by default, it would become "my problem",
but until then...

> -dirty=$(sh -c 'git-diff-index --name-only HEAD' 2>/dev/null) || dirty=
> +dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=

On the other hand, your patch is correct for this part.  The
issue 026351a commit addressed does not apply.  An ancient 'git'
that did not have 'diff-index' (it was called 'diff-cache')
would have hit a breakage early on since 'describe' did not
exist back then.