Skip to content

Commit bc5ef9b

Browse files
peffgitster
authored andcommitted
t5516: fix mismerge in 'next'
The merge of jk/fetch-reachability-error-fix conflicts with jt/test-protocol-version, but the conflict resolution done by b4ce837 has a typo (looks like an editor mistake): $ git show b4ce837 [...] - 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7a2cf3c commit bc5ef9b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t5516-fetch-push.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ do
12421242
# Some protocol versions (e.g. 2) support fetching
12431243
# unadvertised objects, so restrict this test to v0.
12441244
test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
1245-
git fetepo/.git $SHA1_3 &&
1245+
git fetch ../testrepo/.git $SHA1_3 &&
12461246
test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
12471247
git fetch ../testrepo/.git $SHA1_1 &&
12481248
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&

0 commit comments

Comments
 (0)