projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: don't allow commit if svn tree is not current
[git.git]
/
GIT-VERSION-GEN
diff --git
a/GIT-VERSION-GEN
b/GIT-VERSION-GEN
index
1056b7c
..
5d25b7e
100755
(executable)
--- a/
GIT-VERSION-GEN
+++ b/
GIT-VERSION-GEN
@@
-1,19
+1,22
@@
#!/bin/sh
GVF=GIT-VERSION-FILE
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.
2
.GIT
+DEF_VER=v1.
4
.GIT
# First try git-describe, then see if there is a version file
# (included in release tarballs), then default
# 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');
VN=$(echo "$VN" | sed -e 's/-/./g');
-else
+elif test -f version
+then
VN=$(cat version) || VN="$DEF_VER"
VN=$(cat version) || VN="$DEF_VER"
+else
+ VN="$DEF_VER"
fi
VN=$(expr "$VN" : v*'\(.*\)')
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
'')
;;
case "$dirty" in
'')
;;