summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2018-05-10 16:01:54 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-11 12:32:53 +0900
commitf6b82970aa8b81dbaf9242c5a0b33dd8a08431b7 (patch)
treeefc93ef802116d7f5b73e460698d7b40fa410683
parentt5516-fetch-push: fix 'push with dry-run' test (diff)
downloadtgif-f6b82970aa8b81dbaf9242c5a0b33dd8a08431b7.tar.xz
t5516-fetch-push: fix broken &&-chain
b2dc968e60 (t5516: refactor oddball tests, 2008-11-07) accidentaly broke the &&-chain in the test 'push does not update local refs on failure', but since it was in a subshell, chain-lint couldn't notice it. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5516-fetch-push.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 0ed3ad0c7b..013fb102d2 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -612,7 +612,7 @@ test_expect_success 'push does not update local refs on failure' '
chmod +x testrepo/.git/hooks/pre-receive &&
(
cd child &&
- git pull .. master
+ git pull .. master &&
test_must_fail git push &&
test $(git rev-parse master) != \
$(git rev-parse remotes/origin/master)