Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rj/git-version-gen-do-not-force-abbrev'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000
(14:45 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000
(14:45 -0800)
A minor build update.
* rj/git-version-gen-do-not-force-abbrev:
GIT-VERSION-GEN: do not force abbreviation length used by 'describe'
GIT-VERSION-GEN
patch
|
blob
|
history
raw
(from parent 1:
db09f21
)
diff --git
a/GIT-VERSION-GEN
b/GIT-VERSION-GEN
index 556fbfc104b1ed25edeac9b88fec3f697228efea..f95b04bb365fb83c0366a7206ee700ba3f898f6c 100755
(executable)
--- a/
GIT-VERSION-GEN
+++ b/
GIT-VERSION-GEN
@@
-12,7
+12,7
@@
if test -f version
then
VN=$(cat version) || VN="$DEF_VER"
elif test -d ${GIT_DIR:-.git} -o -f .git &&
- VN=$(git describe --match "v[0-9]*"
--abbrev=7
HEAD 2>/dev/null) &&
+ VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
v[0-9]*)