Add a second testcase for handling invalid strategies in git-merge

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 03fb9d76aea22a7d7d7f5e2351fcf169ccd7987b..cb7cd4b53827fa6820e84b1318572d0115b3b17f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.4.2.GIT
+DEF_VER=v1.5.6.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]*)
-               git diff-index --quiet HEAD || VN="$VN-dirty" ;;
+               test -z "$(git diff-index --name-only HEAD --)" ||
+               VN="$VN-dirty" ;;
        esac
 then
        VN=$(echo "$VN" | sed -e 's/-/./g');