Merge branch 'maint'

diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh
index 9891e2c1f5e5da357df795ee05969fbde72887ba..95fab2036109c5a4aef8ff3d8100403fe335819f 100755 (executable)
--- a/t/t7105-reset-patch.sh
+++ b/t/t7105-reset-patch.sh
@@ -18,7 +18,7 @@ test_expect_success PERL 'setup' '
 # note: bar sorts before foo, so the first 'n' is always to skip 'bar'
 
 test_expect_success PERL 'saying "n" does nothing' '
-       set_and_save_state dir/foo work work
+       set_and_save_state dir/foo work work &&
        (echo n; echo n) | git reset -p &&
        verify_saved_state dir/foo &&
        verify_saved_state bar
@@ -42,14 +42,14 @@ test_expect_success PERL 'git reset -p HEAD^' '
 # the failure case (and thus get out of the loop).
 
 test_expect_success PERL 'git reset -p dir' '
-       set_state dir/foo work work
+       set_state dir/foo work work &&
        (echo y; echo n) | git reset -p dir &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 
 test_expect_success PERL 'git reset -p -- foo (inside dir)' '
-       set_state dir/foo work work
+       set_state dir/foo work work &&
        (echo y; echo n) | (cd dir && git reset -p -- foo) &&
        verify_state dir/foo work head &&
        verify_saved_state bar