Merge branch 'maint'

diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index d1819ca23a782eddc61d86c62060242b293b86b0..1e7193ac0bc650868f187d3103be32c3004a95b2 100755 (executable)
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -20,7 +20,7 @@ test_expect_success PERL 'setup' '
 # note: bar sorts before dir, so the first 'n' is always to skip 'bar'
 
 test_expect_success PERL 'saying "n" does nothing' '
-       set_state dir/foo work index
+       set_state dir/foo work index &&
        (echo n; echo n) | test_must_fail git stash save -p &&
        verify_state dir/foo work index &&
        verify_saved_state bar