Merge branch 'maint-1.5.1' into maint

diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN
index 8fac8cb410b6d4e3e10ed775a5c179698b49571e..25647c8060d8e30ef48d972e487dc9b280266b88 100755 (executable)
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=0.6.GITGUI
+DEF_VER=0.7.GITGUI
 
 LF='
 '
@@ -10,7 +10,7 @@ tree_search ()
 {
        head=$1
        tree=$2
-       for p in $(git rev-list --parents --max-count=1 $head 2>/devnull)
+       for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
        do
                test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
                vn=$(git describe --abbrev=4 $p 2>/dev/null) &&
@@ -20,6 +20,11 @@ tree_search ()
        done
 }
 
+# Always use the tarball version file if found, just
+# in case we are somehow contained in a larger git
+# repository that doesn't actually track our state.
+# (At least one package manager is doing this.)
+#
 # We may be a subproject, so try looking for the merge
 # commit that supplied this directory content if we are
 # not at the toplevel.  We probably will always be the
@@ -27,10 +32,13 @@ tree_search ()
 # that fact.
 #
 # If we are at the toplevel or the merge assumption fails
-# try looking for a gitgui-* tag, or fallback onto the
-# distributed version file.
+# try looking for a gitgui-* tag.
 
-if prefix="$(git rev-parse --show-prefix 2>/dev/null)"
+if test -f version &&
+   VN=$(cat version)
+then
+       : happy
+elif prefix="$(git rev-parse --show-prefix 2>/dev/null)"
    test -n "$prefix" &&
    head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
    tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
@@ -48,9 +56,6 @@ elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
    esac
 then
        VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
-elif test -f version
-then
-       VN=$(cat version) || VN="$DEF_VER"
 else
        VN="$DEF_VER"
 fi