From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 4 Jan 2015 23:12:07 +0000 (+0000)
Subject: GIT-VERSION-GEN: Recognize git version in gitweb snapshots.
X-Git-Tag: v0.5.4~2^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=95287575857a96b049b5e7faeb03fd36c3a9df07;hp=-c

GIT-VERSION-GEN: Recognize git version in gitweb snapshots.

gitweb prepends the repo name and the git version number to all paths
of the snapshot tarballs (example: paraslash-32a81d7/). This commit
teaches GIT-VERSION-GEN to make use of this information. The patched
script reports the git version thusly encoded in the current directory,
rather than resort to "unnamed_version" as before.
---

95287575857a96b049b5e7faeb03fd36c3a9df07
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index df7ed327..b8abff35 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -8,7 +8,7 @@ LF='
 '
 
 # First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
+# then try git-describe, then gitweb, then default.
 if [[ -f VERSION ]]; then
 	VN=$(cat VERSION) || VN="$DEF_VER"
 elif [[ -d .git || -f .git ]] &&
@@ -22,6 +22,8 @@ elif [[ -d .git || -f .git ]] &&
 	esac
 then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
+elif [[ "$PWD" =~ paraslash-[a-f0-9]{1,} ]]; then
+	VN="${PWD#*-}"
 else
 	VN="$DEF_VER"
 fi