Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add a second testcase for handling invalid strategies in git-merge
[gitweb.git]
/
GIT-VERSION-GEN
diff --git
a/GIT-VERSION-GEN
b/GIT-VERSION-GEN
index f221447478aea8628c0ab6d098338f7e8630201e..cb7cd4b53827fa6820e84b1318572d0115b3b17f 100755
(executable)
--- a/
GIT-VERSION-GEN
+++ b/
GIT-VERSION-GEN
@@
-16,7
+16,7
@@
elif test -d .git -o -f .git &&
case "$VN" in
*$LF*) (exit 1) ;;
v[0-9]*)
- test -z "$(git diff-index --name-only HEAD)" ||
+ test -z "$(git diff-index --name-only HEAD
--
)" ||
VN="$VN-dirty" ;;
esac
then