Merge branch 'sb/submodule-update-reset-fix' into maint

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 2d95778b74b8fdb3e4d2e00b458d8b5f2beb3576..170b4810e052cc8092cea4ead4f3c098707f0f38 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -130,8 +130,8 @@ EOF
 test_expect_success 'commit message from template with whitespace issue' '
        echo "content galore" >>foo &&
        git add foo &&
-       GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-whitespaced-content git commit \
-               --template "$TEMPLATE" &&
+       GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
+       git commit --template "$TEMPLATE" &&
        commit_msg_is "commit message"
 '