summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2019-02-25 21:54:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-07 01:02:42 (GMT)
commit010834a812be856790e1f08767e6198bcfd1a8c9 (patch)
tree7ca1018d05343eeab132dfabf04072ffe97dbc83 /t
parentd790ee1707374022d9296e8af62c137fb2627587 (diff)
downloadgit-010834a812be856790e1f08767e6198bcfd1a8c9.zip
git-010834a812be856790e1f08767e6198bcfd1a8c9.tar.gz
git-010834a812be856790e1f08767e6198bcfd1a8c9.tar.bz2
t5552: compensate for v2 filtering ref adv.
Protocol v2 filters the ref advertisement, but protocol v0 does not. A test in t5552 uses the ref advertisement, so fix it to use protocol v0. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t5552-skipping-fetch-negotiator.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index 30857b8..8a14be5 100755
--- a/t/t5552-skipping-fetch-negotiator.sh
+++ b/t/t5552-skipping-fetch-negotiator.sh
@@ -127,7 +127,10 @@ test_expect_success 'use ref advertisement to filter out commits' '
# not need to send any ancestors of "c3", but we still need to send "c3"
# itself.
test_config -C client fetch.negotiationalgorithm skipping &&
- trace_fetch client origin to_fetch &&
+
+ # The ref advertisement itself is filtered when protocol v2 is used, so
+ # use v0.
+ GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch &&
have_sent c5 c4^ c2side &&
have_not_sent c4 c4^^ c4^^^
'