Merge branch 'js/test-with-ws-in-path'

Test fixes.

* js/test-with-ws-in-path:
t0302 & t3900: add forgotten quotes
Allow the test suite to pass in a directory whose name contains spaces

diff --git a/t/t0302-credential-store.sh b/t/t0302-credential-store.sh
index 1d8d1f210b99e888fa39da14f73aef19eaf338b5..d6b54e8c65a3ec4408fe07ee76a6d8bed957207a 100755 (executable)
--- a/t/t0302-credential-store.sh
+++ b/t/t0302-credential-store.sh
@@ -37,7 +37,7 @@ helper_test store
 unset XDG_CONFIG_HOME
 
 test_expect_success 'if custom xdg file exists, home and xdg files not created' '
-       test_when_finished "rm -f $HOME/xdg/git/credentials" &&
+       test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
        test -s "$HOME/xdg/git/credentials" &&
        test_path_is_missing "$HOME/.git-credentials" &&
        test_path_is_missing "$HOME/.config/git/credentials"

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 3b94283e35535ea4c594e3e746bd01a095eba4e7..9e4e694d939b217d2f0e308d7b4a3a735c9751ce 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because of NULs' '
 '
 
 test_expect_success 'UTF-8 invalid characters refused' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
        echo "UTF-8 characters" >F &&
        printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
                >"$HOME/invalid" &&
@@ -49,7 +49,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
 '
 
 test_expect_success 'UTF-8 overlong sequences rejected' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
        rm -f "$HOME/stderr" "$HOME/invalid" &&
        echo "UTF-8 overlong" >F &&
        printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
@@ -59,7 +59,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
 '
 
 test_expect_success 'UTF-8 non-characters refused' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
        echo "UTF-8 non-character 1" >F &&
        printf "Commit message\n\nNon-character:\364\217\277\276\n" \
                >"$HOME/invalid" &&
@@ -68,7 +68,7 @@ test_expect_success 'UTF-8 non-characters refused' '
 '
 
 test_expect_success 'UTF-8 non-characters refused' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
        echo "UTF-8 non-character 2." >F &&
        printf "Commit message\n\nNon-character:\357\267\220\n" \
                >"$HOME/invalid" &&

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 5739d3ed232268331517d59600d1e72b625360d2..1d33c5feb3e23744a5709e2f9bf429d23f49101f 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"
 '
 

diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
index 4d81ba1c2c43bfe14cb329967ccf2c97b90a4848..6fca08e5e35bd35cab5b97654b4a852ac28c9a34 100755 (executable)
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
@@ -25,8 +25,8 @@ init_git () {
        git init &&
        #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
        # let's reuse an existing dump file!?
-       git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
-       git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
+       git remote add svnsim "testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump"
+       git remote add svnfile "testsvn::file://$TEST_DIRECTORY/t9154/svn.dump"
 }
 
 if test -e "$GIT_BUILD_DIR/git-remote-testsvn"

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 9f3ef8f2ef614814887f94b7f53e4a7e96f6bbcf..ceaa5bad105e52eca3d193255766548e41d84f31 100755 (executable)
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -28,7 +28,7 @@ test_expect_success 'git-svn-HEAD is a real HEAD' '
        git rev-parse --verify refs/heads/git-svn-HEAD^0
 '
 
-svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
+svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/g')
 
 test_expect_success 'initialize old-style (v0) git svn layout' '
        mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&