diff options
| author | Bryan Donlan <bdonlan@fushizen.net> | 2008-05-04 01:38:00 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-05 14:37:51 -0700 |
| commit | 4a7aaccd83a4f9eca17ca936b7c297e01840f587 (patch) | |
| tree | 1a2070d3846651b0e5d071ddd9c6f55605310a91 | |
| parent | f69e836fab2b634281d92a0d304de4d768e479cc (diff) | |
| download | git-4a7aaccd83a4f9eca17ca936b7c297e01840f587.tar.gz | |
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>
| -rw-r--r-- | t/.gitignore | 2 | ||||
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 6 | ||||
| -rw-r--r-- | t/test-lib.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/t/.gitignore b/t/.gitignore index fad67c097b..11ffd910c1 100644 --- 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 526d7d1c44..9c0b92632c 100755 --- 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 ' -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 && - git fetch ../trash left && + git fetch ../"$test" left && 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 04e098b96e..5002fb04b5 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -411,14 +411,14 @@ fi . ../GIT-BUILD-OPTIONS # Test repository -test=trash +test="trash directory" 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]*\)-[^/]*$') |