From a814615a6a1722839c69dcc998ed4fae9da08310 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 7 Sep 2010 03:22:53 -0500 Subject: [PATCH] t2016 (checkout -p): add missing && Although the set_state command is not likely to fail, it is best to stay in the habit of checking for failures. Cc: Thomas Rast Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t2016-checkout-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh index 7657ec190c..a463b13b27 100755 --- a/t/t2016-checkout-patch.sh +++ b/t/t2016-checkout-patch.sh @@ -52,7 +52,7 @@ test_expect_success PERL 'git checkout -p HEAD with NO staged changes: apply' ' ' test_expect_success PERL 'git checkout -p HEAD with change already staged' ' - set_state dir/foo index index + set_state dir/foo index index && # the third n is to get out in case it mistakenly does not apply (echo n; echo y; echo n) | git checkout -p HEAD && verify_saved_state bar && -- 2.11.4.GIT