diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2019-02-25 22:54:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 02:02:42 +0100 |
| commit | d790ee1707374022d9296e8af62c137fb2627587 (patch) | |
| tree | 44683923c20bafcd9da355fa3a1f84499b93455a /t/t5515-fetch-merge-logic.sh | |
| parent | t5700: only run with protocol version 1 (diff) | |
| download | git-d790ee1707374022d9296e8af62c137fb2627587.tar.xz git-d790ee1707374022d9296e8af62c137fb2627587.zip | |
tests: fix protocol version for overspecifications
These tests are also marked with a NEEDSWORK comment.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
| -rwxr-xr-x | t/t5515-fetch-merge-logic.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 36b0dbc01c..e55d8474ef 100755 --- 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=' |