From: Jonathan Nieder Date: Tue, 7 Sep 2010 08:22:53 +0000 (-0500) Subject: t2016 (checkout -p): add missing && X-Git-Tag: v1.7.3-rc2~3^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a814615a6a1722839c69dcc998ed4fae9da08310;p=git.git 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 --- diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh index 7657ec190..a463b13b2 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 &&