diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-22 18:54:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-22 18:54:19 -0700 |
| commit | 4d8df3feb806ef85693a9f7c4b8c20ca5c1caa56 (patch) | |
| tree | 82a6c78b367b284e3ee371e7530c5fec5f7857ea /GIT-VERSION-GEN | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | Remove possible segfault in http-fetch. (diff) | |
| download | tgif-4d8df3feb806ef85693a9f7c4b8c20ca5c1caa56.tar.xz | |
Merge branch 'se/http' into next
* se/http:
Remove possible segfault in http-fetch.
Install git builtins into gitexecdir rather than bindir.
Change GIT-VERSION-GEN to call git commands with "git" not "git-".
cvsimport: replace anonymous sub ref with a normal sub
cvsimport: minor fixups
Problem: 'trap...exit' causes error message when /bin/sh is ash.
Avoid segfault in diff --stat rename output.
Tutorial #2: broken link fix.
git help: remove whatchanged from list of common commands
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 7fcefcd7c4..a461518cde 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 '') ;; |