Merge branch 'maint-1.6.3' into maint

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 2f8404afbbc38e9bed17b1d3c9dde22ddcb2eaa2..b647957d75fa0d0ce4d88c7c3c7243f31af38b4a 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -7,6 +7,7 @@ test_description='GIT_EDITOR, core.editor, and stuff'
 for i in GIT_EDITOR core_editor EDITOR VISUAL vi
 do
        cat >e-$i.sh <<-EOF
+       #!$SHELL_PATH
        echo "Edited by $i" >"\$1"
        EOF
        chmod +x e-$i.sh
@@ -91,7 +92,6 @@ if ! echo 'echo space > "$1"' > "e space.sh"
 then
        say "Skipping; FS does not support spaces in filenames"
        test_done
-       exit
 fi
 
 test_expect_success 'editor with a space' '