From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
peff@peff.net, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 8/8] t5552: compensate for v2 filtering ref adv.
Date: Mon, 25 Feb 2019 13:54:13 -0800 [thread overview]
Message-ID: <629a243c7f53cfb01f7fec060db318f650ad33d3.1551131153.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1551131153.git.jonathantanmy@google.com>
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>
---
t/t5552-skipping-fetch-negotiator.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index 30857b84a8..8a14be51a1 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^^^
'
--
2.19.0.271.gfe8321ec05.dirty
prev parent reply other threads:[~2019-02-25 21:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-25 21:54 [PATCH 0/8] GIT_TEST_PROTOCOL_VERSION, this time on master Jonathan Tan
2019-02-25 21:54 ` [PATCH 1/8] tests: define GIT_TEST_PROTOCOL_VERSION Jonathan Tan
2019-02-25 21:54 ` [PATCH 2/8] t5601: check ssh command only with protocol v0 Jonathan Tan
2019-02-25 21:54 ` [PATCH 3/8] tests: always test fetch of unreachable with v0 Jonathan Tan
2019-02-25 21:54 ` [PATCH 4/8] t5503: fix overspecification of trace expectation Jonathan Tan
2019-02-25 21:54 ` [PATCH 5/8] t5512: compensate for v0 only sending HEAD symrefs Jonathan Tan
2019-02-25 21:54 ` [PATCH 6/8] t5700: only run with protocol version 1 Jonathan Tan
2019-02-25 21:54 ` [PATCH 7/8] tests: fix protocol version for overspecifications Jonathan Tan
2019-02-25 21:54 ` Jonathan Tan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=629a243c7f53cfb01f7fec060db318f650ad33d3.1551131153.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).