Merge branch 'jc/maint-log-grep' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 445dca3ffcb7074dc58ee41d971c1164e97ee14f..156dc137339c4184727d1916e49a5bdf8c674d68 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.6.5.GIT
+DEF_VER=v1.6.0.GIT
 
 LF='
 '
@@ -16,7 +16,8 @@ elif test -d .git -o -f .git &&
        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