git-fetch --upload-pack: disambiguate.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7763639a82bf7e2d4ccef8d2795b9e9dda197e9b..e3cd9fa09422236063053faf61d358dc98f4d4d0 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,11 +5,20 @@ DEF_VER=v1.1.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
-VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) ||
+VN=$(git-describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
 VN=$(cat version) ||
 VN="$DEF_VER"
 
 VN=$(expr "$VN" : v*'\(.*\)')
+
+dirty=$(sh -c 'git-diff-index --name-only HEAD' 2>/dev/null) || dirty=
+case "$dirty" in
+'')
+       ;;
+*)
+       VN="$VN-dirty" ;;
+esac
+
 if test -r $GVF
 then
        VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)