diff options
| author | Sean <seanlkml@sympatico.ca> | 2006-05-22 00:39:52 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-22 18:20:46 -0700 |
| commit | 1100ac81a90b03e0c037a286569a340decf7489b (patch) | |
| tree | 1b0e7fd218c20f72ba6d1727ca009d005cf13d0c /GIT-VERSION-GEN | |
| parent | c4b16f8d7786c2a9655636779ce4e3e89f0df86c (diff) | |
| download | git-1100ac81a90b03e0c037a286569a340decf7489b.tar.gz git-1100ac81a90b03e0c037a286569a340decf7489b.tar.xz | |
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>
Diffstat (limited to 'GIT-VERSION-GEN')
| -rwxr-xr-x | GIT-VERSION-GEN | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 7fcefcd7c..a461518cd 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 '') ;; |