From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu, 10 May 2018 14:01:54 +0000 (+0200)
Subject: t5516-fetch-push: fix broken &&-chain
X-Git-Tag: v2.18.0-rc0~65^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6b82970aa8b81dbaf9242c5a0b33dd8a08431b7?hp=--cc

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>
---

f6b82970aa8b81dbaf9242c5a0b33dd8a08431b7
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)