X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=2741c1e14c4f38b33d10c1679b48c4fc5d9c5587;hb=refs%2Ftags%2Fgitgui-0.6.5;hp=9966126da2682f7b7d65b71a3225dddd1b5fe55b;hpb=022fef30facd6865d99b0cfceead7de3d60fe7de;p=git.git

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9966126da..2741c1e14 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -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