Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index b2ca77b3384c97954991eae9c5af89c4d8d8035e..5fcf281dfbf8d601fc934d890db79f7284b19402 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -112,7 +112,7 @@ do
 done
 
 test_expect_success 'editor with a space' '
-       echo "echo space >\$1" >"e space.sh" &&
+       echo "echo space >\"\$1\"" >"e space.sh" &&
        chmod a+x "e space.sh" &&
        GIT_EDITOR="./e\ space.sh" git commit --amend &&
        test space = "$(git show -s --pretty=format:%s)"