projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aft: Unify handling of hash and path duplicates.
[paraslash.git]
/
GIT-VERSION-GEN
diff --git
a/GIT-VERSION-GEN
b/GIT-VERSION-GEN
index 32802232244a6a79258f2640e7e0f7e3ddd950a2..b8abff355e071af95ae8fc7aafd575e131495438 100755
(executable)
--- 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),
'
# 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 ]] &&
if [[ -f VERSION ]]; then
VN=$(cat VERSION) || VN="$DEF_VER"
elif [[ -d .git || -f .git ]] &&
@@
-16,12
+16,14
@@
elif [[ -d .git || -f .git ]] &&
case "$VN" in
*$LF*) (exit 1) ;;
v[0-9]*)
case "$VN" in
*$LF*) (exit 1) ;;
v[0-9]*)
- git update-index -q --refresh
+ git update-index -q --refresh
&>/dev/null
test -z "$(git diff-index --name-only HEAD --)" ||
VN="$VN-dirty" ;;
esac
then
VN=$(echo "$VN" | sed -e 's/-/./g');
test -z "$(git diff-index --name-only HEAD --)" ||
VN="$VN-dirty" ;;
esac
then
VN=$(echo "$VN" | sed -e 's/-/./g');
+elif [[ "$PWD" =~ paraslash-[a-f0-9]{1,} ]]; then
+ VN="${PWD#*-}"
else
VN="$DEF_VER"
fi
else
VN="$DEF_VER"
fi