From: Sean <seanlkml@sympatico.ca>
Date: Mon, 22 May 2006 04:39:52 +0000 (-0400)
Subject: Change GIT-VERSION-GEN to call git commands with "git" not "git-".
X-Git-Tag: v1.4.0-rc1~93
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1100ac81a90b03e0c037a286569a340decf7489b;p=git.git

Change GIT-VERSION-GEN to call git commands with "git" not "git-".

GIT-VERSION-GEN can incorrectly return a default version of
"v1.3.GIT" because it tries to execute git commands using the
"git-cmd" format that expects all git commands to be in the $PATH.
Convert these to  "git cmd" format so that a proper answer is
returned even when the git commands have been moved out of the
$PATH and into a $gitexecdir.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7fcefcd7..a461518c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,7 +5,7 @@ DEF_VER=v1.3.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
-if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
+if VN=$(git describe --abbrev=4 HEAD 2>/dev/null); then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
 elif test -f version
 then
@@ -16,7 +16,7 @@ fi
 
 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
 '')
 	;;