summaryrefslogtreecommitdiff
path: root/t/t5510-fetch.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-20 10:06:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-20 17:20:13 (GMT)
commit8fb268720e8565885039e7491f4628974e2d66a2 (patch)
tree62e1615b5e6ce8f08238bff5b947f646e377e706 /t/t5510-fetch.sh
parentbb79af9d09709d6d93a01d1494d0ca93ff6d4b99 (diff)
downloadgit-8fb268720e8565885039e7491f4628974e2d66a2.zip
git-8fb268720e8565885039e7491f4628974e2d66a2.tar.gz
git-8fb268720e8565885039e7491f4628974e2d66a2.tar.bz2
t: fix severe &&-chain breakage
These are tests which are missing a link in their &&-chain, in a location which causes a significant portion of the test to be missed (e.g., the test effectively does nothing, or consists of a long string of actions and output comparisons, and we throw away the exit code of at least one part of the string). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5510-fetch.sh')
-rwxr-xr-xt/t5510-fetch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index d78f320..d3fa2c9 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -124,7 +124,7 @@ test_expect_success 'fetch --prune handles overlapping refspecs' '
git rev-parse origin/master &&
git rev-parse origin/pr/42 &&
- git config --unset-all remote.origin.fetch
+ git config --unset-all remote.origin.fetch &&
git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&