Rename the test trash directory to contain spaces.

In order to help prevent regressions in the future, rename the trash directory
for all tests to contain spaces. This patch also corrects two failures that
were caused or exposed by this change.

Signed-off-by: Bryan Donlan <bdonlan@fushizen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/.gitignore b/t/.gitignore
index fad67c097b08c695c57c376946f3093f487d4358..11ffd910c1b5022e0bd3aa217147269c8e9ac29e 100644 (file)
--- a/t/.gitignore
+++ b/t/.gitignore
@@ -1 +1 @@
-trash
+/trash directory

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 526d7d1c4422e342c7257e260626dac3dda36a3a..9c0b92632cd815504f229823db3135e3ffcdbc1b 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -82,14 +82,14 @@ test_expect_success 'merge-msg test #1' '
        git diff actual expected
 '
 
        git diff actual expected
 '
 

-cat >expected <<\EOF
-Merge branch 'left' of ../trash
+cat >expected <<EOF
+Merge branch 'left' of ../$test

 EOF
 
 test_expect_success 'merge-msg test #2' '
 
        git checkout master &&
 EOF
 
 test_expect_success 'merge-msg test #2' '
 
        git checkout master &&

-       git fetch ../trash left &&
+       git fetch ../"$test" left &&

 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
        git diff actual expected
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
        git diff actual expected

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 04e098b96e94321ea6e78d0b859aa4652c7509d0..5002fb04b58ea91572b58dcaf7fe92342f4eeab1 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -411,14 +411,14 @@ fi
 . ../GIT-BUILD-OPTIONS
 
 # Test repository
 . ../GIT-BUILD-OPTIONS
 
 # Test repository

-test=trash
+test="trash directory"

 rm -fr "$test" || {
        trap - exit
        echo >&5 "FATAL: Cannot prepare test area"
        exit 1
 }
 
 rm -fr "$test" || {
        trap - exit
        echo >&5 "FATAL: Cannot prepare test area"
        exit 1
 }
 

-test_create_repo $test
+test_create_repo "$test"

 cd "$test"
 
 this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$')
 cd "$test"
 
 this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$')