Merge branch 'maint' into ef/ipv4-connect-error-report

diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index a463b13b27fec87e0f4adb1154fea26b0eee73d9..9cd0ac4ba3f14dc85b35fa14e20ceb16f191f724 100755 (executable)
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -32,7 +32,7 @@ test_expect_success PERL 'git checkout -p' '
 '
 
 test_expect_success PERL 'git checkout -p with staged changes' '
-       set_state dir/foo work index
+       set_state dir/foo work index &&
        (echo n; echo y) | git checkout -p &&
        verify_saved_state bar &&
        verify_state dir/foo index index