From 4a7aaccd83a4f9eca17ca936b7c297e01840f587 Mon Sep 17 00:00:00 2001 From: Bryan Donlan Date: Sun, 4 May 2008 01:38:00 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/.gitignore | 2 +- t/t6200-fmt-merge-msg.sh | 6 +++--- t/test-lib.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/.gitignore b/t/.gitignore index fad67c097..11ffd910c 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 526d7d1c4..9c0b92632 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 <actual && git diff actual expected diff --git a/t/test-lib.sh b/t/test-lib.sh index 04e098b96..5002fb04b 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]*\)-[^/]*$') -- 2.30.2