Allow the test suite to pass in a directory whose name contains spaces

It is totally legitimate to clone Git's source code anywhere, including
into, say, directories whose name (or the name of its absolute path)
contains spaces.

However, a couple of tests failed to anticipate this, for lack of
quoting (or in one instance, for failure to expect more than one space
in the absolute path of the TEST_DIRECTORY). This can be easily verified
by calling these commands in your current clone:

git clone . with\ spaces
cd with\ spaces
make -j15 test

Let's fix this.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 116885a260a56f94550ace2b541498a5e6f8e877..ea009b488ab27f536decfea28335eca6cd911a37 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 &&
 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"
 '
 
        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 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"
 }
 
 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
 '
 
        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 &&
 
 test_expect_success 'initialize old-style (v0) git svn layout' '
        mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&