From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] t5516: fix mismerge in 'next'
Date: Mon, 22 Apr 2019 00:48:12 -0400 [thread overview]
Message-ID: <20190422044812.GA28493@sigill.intra.peff.net> (raw)
The merge of jk/fetch-reachability-error-fix conflicts with
jt/test-protocol-version, but the conflict resolution done by
b4ce8375c018 has a typo (looks like an editor mistake):
$ git show b4ce8375c018
[...]
- test_must_fail git fetch ../testrepo/.git $SHA1_3 &&
- test_must_fail git fetch ../testrepo/.git $SHA1_1 &&
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
- test_must_fail ok=sigpipe env GIT_TEST_PROTOCOL_VERSION= \
- git fetch ../testrepo/.git $SHA1_3 &&
- test_must_fail ok=sigpipe env GIT_TEST_PROTOCOL_VERSION= \
++ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
++ git fetepo/.git $SHA1_3 &&
++ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch ../testrepo/.git $SHA1_1 &&
The tests don't notice the bogus command because we expect the command
to fail.
Signed-off-by: Jeff King <peff@peff.net>
---
The same problem is present in the merges to pu, which is not surprising
since the 'next' merge was probably just resolved by rerere. We'd
presumably want a fixup like this for 'next' until the next rewind, but
the more important thing is to adjust the rerere cache so the eventual
merge to 'master' is correct.
t/t5516-fetch-push.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 09e7178987..c81ca360ac 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1242,7 +1242,7 @@ do
# Some protocol versions (e.g. 2) support fetching
# unadvertised objects, so restrict this test to v0.
test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
- git fetepo/.git $SHA1_3 &&
+ git fetch ../testrepo/.git $SHA1_3 &&
test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
git fetch ../testrepo/.git $SHA1_1 &&
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
--
2.21.0.1179.g65a7c4fda7
next reply other threads:[~2019-04-22 4:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 4:48 Jeff King [this message]
2019-04-22 6:25 ` [PATCH] t5516: fix mismerge in 'next' Junio C Hamano
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=20190422044812.GA28493@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).