builtin-fast-export.c: handle nested tags

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index af9d78daea729eb4e753a9e910ce5eafbdee7c52..97fc1e0519936111beb295cbb345aa206cdd8893 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.5.5.GIT
+DEF_VER=v1.6.2.GIT
 
 LF='
 '
@@ -11,12 +11,13 @@ LF='
 if test -f version
 then
        VN=$(cat version) || VN="$DEF_VER"
-elif test -d .git &&
+elif test -d .git -o -f .git &&
        VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)
-               test -z "$(git diff-index --name-only HEAD)" ||
+               git update-index -q --refresh
+               test -z "$(git diff-index --name-only HEAD --)" ||
                VN="$VN-dirty" ;;
        esac
 then