Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 72559e1b01f10cc0b2013f60c6140b82998148d3..9e236f9cc0bf43155d377c1706c8142d843c417d 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -82,10 +82,9 @@ EOF
 '
 
 test_expect_success PERL 'setup fake editor' '
-       cat >fake_editor.sh <<EOF
-       EOF
+       >fake_editor.sh &&
        chmod a+x fake_editor.sh &&
-       test_set_editor "$(pwd)/fake_editor.sh" &&
+       test_set_editor "$(pwd)/fake_editor.sh"
 '
 
 test_expect_success PERL 'dummy edit works' '
@@ -311,7 +310,7 @@ test_expect_success PERL 'split hunk setup' '
        done >test
 '
 
-test_expect_failure PERL 'split hunk "add -p (edit)"' '
+test_expect_success PERL 'split hunk "add -p (edit)"' '
        # Split, say Edit and do nothing.  Then:
        #
        # 1. Broken version results in a patch that does not apply and