From: Brandon Casey <drafnel@gmail.com>
Date: Sun, 18 May 2008 04:03:03 +0000 (-0500)
Subject: t/Makefile: "trash" directory was renamed recently
X-Git-Tag: v1.5.6-rc0~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9231e3a953c0780846dacdcf3928f6658fa4fad0;p=git.git

t/Makefile: "trash" directory was renamed recently

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/Makefile b/t/Makefile
index 72d788423..c6a60ab16 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -20,7 +20,7 @@ $(T):
 	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
 
 clean:
-	$(RM) -r trash
+	$(RM) -r 'trash directory'
 
 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-svn-test:
diff --git a/t/README b/t/README
index 73ed11bfe..70841a464 100644
--- a/t/README
+++ b/t/README
@@ -123,7 +123,7 @@ This test harness library does the following things:
    (or -h), it shows the test_description and exits.
 
  - Creates an empty test directory with an empty .git/objects
-   database and chdir(2) into it.  This directory is 't/trash'
+   database and chdir(2) into it.  This directory is 't/trash directory'
    if you must know, but I do not think you care.
 
  - Defines standard test helper functions for your scripts to
diff --git a/t/test-lib.sh b/t/test-lib.sh
index d1018c99c..3bf570b06 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -368,7 +368,7 @@ test_done () {
 	case "$test_failure" in
 	0)
 		# We could:
-		# cd .. && rm -fr trash
+		# cd .. && rm -fr 'trash directory'
 		# but that means we forbid any tests that use their own
 		# subdirectory from calling test_done without coming back
 		# to where they started from.