[PATCH] 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 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(-)