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>
Bryan Donlan committed
May 4, 2008 at 01:38 UTC
4a7aaccd83a4f9eca17ca936b7c297e01840f587
3 files changed
+6
-6
t/.gitignore
+1
-1
@@ -1 +1 @@
1
-trash
1
+/trash directory
t/t6200-fmt-merge-msg.sh
+3
-3
@@ -82,14 +82,14 @@ test_expect_success 'merge-msg test #1' '
82
git diff actual expected
83
'
84
85
-cat >expected <<\EOF
86
-Merge branch 'left' of ../trash
85
+cat >expected <<EOF
86
+Merge branch 'left' of ../$test
87
EOF
88
89
test_expect_success 'merge-msg test #2' '
90
91
git checkout master &&
92
- git fetch ../trash left &&
92
+ git fetch ../"$test" left &&
93
94
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
95
git diff actual expected
t/test-lib.sh
+2
-2
@@ -411,14 +411,14 @@ fi
411
. ../GIT-BUILD-OPTIONS
412
413
# Test repository
414
-test=trash
414
+test="trash directory"
415
rm -fr "$test" || {
416
trap - exit
417
echo >&5 "FATAL: Cannot prepare test area"
418
exit 1
419
}
420
421
-test_create_repo $test
421
+test_create_repo "$test"
422
cd "$test"
423
424
this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$')