Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tests: add a special setup where prerequisites fail
[gitweb.git]
/
t
/
t5515-fetch-merge-logic.sh
diff --git
a/t/t5515-fetch-merge-logic.sh
b/t/t5515-fetch-merge-logic.sh
index 36b0dbc01cffc06aefb180179965ccbaa9c983d8..e55d8474efb6891d4bea9edf5488f793b26e135a 100755
(executable)
--- a/
t/t5515-fetch-merge-logic.sh
+++ b/
t/t5515-fetch-merge-logic.sh
@@
-6,6
+6,10
@@
test_description='Merge logic in fetch'
+# NEEDSWORK: If the overspecification of the expected result is reduced, we
+# might be able to run this test in all protocol versions.
+GIT_TEST_PROTOCOL_VERSION=
+
. ./test-lib.sh
LF='