Make get-version work when repo is a git submodule.

8efd731c · Johnny S. Lee · Simon Kelley · a5ae1f85 · 8efd731c
Commit 8efd731c authored Apr 26, 2015 by Johnny S. Lee Committed by Simon Kelley Apr 26, 2015
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

bld/get-version bld/get-version +3 -2

No files found.
--- a/bld/get-version
+++ b/bld/get-version
@@ -11,7 +11,8 @@
 # If there is more than one v[0-9].* tag, sort them and use the
 # first. This favours, eg v2.63 over 2.63rc6.

-if which git >/dev/null 2>&1 && [ -d $1/.git ]; then
+if which git >/dev/null 2>&1 && \
+    ([ -d $1/.git ] || grep '^gitdir:' $1/.git >/dev/null 2>&1); then 
    cd $1; git describe | sed 's/^v//'
 elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then
 # unsubstituted VERSION, but no git available.