Skip to content

Commit

Permalink
Change GIT-VERSION-GEN to call git commands with "git" not "git-".
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sean authored and Junio C Hamano committed May 23, 2006
1 parent c4b16f8 commit 1100ac8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions GIT-VERSION-GEN
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
'')
;;
Expand Down

0 comments on commit 1100ac8

Please sign in to comment.