combine-diff: better hunk splitting.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e3cd9fa09422236063053faf61d358dc98f4d4d0..72201be57c633259e65b435f8623a80e4cdc3e88 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,9 +5,11 @@ 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 | sed -e 's/-/./g') ||
-VN=$(cat version) ||
-VN="$DEF_VER"
+if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
+       VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+       VN=$(cat version) || VN="$DEF_VER"
+fi
 
 VN=$(expr "$VN" : v*'\(.*\)')