summaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
diff options
context:
space:
mode:
authorBryan Donlan <bdonlan@fushizen.net>2008-05-04 01:38:00 -0400
committerJunio C Hamano <gitster@pobox.com>2008-05-05 14:37:51 -0700
commit4a7aaccd83a4f9eca17ca936b7c297e01840f587 (patch)
tree1a2070d3846651b0e5d071ddd9c6f55605310a91 /t/t6200-fmt-merge-msg.sh
parentf69e836fab2b634281d92a0d304de4d768e479cc (diff)
downloadgit-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>
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
-rwxr-xr-xt/t6200-fmt-merge-msg.sh6
1 files changed, 3 insertions, 3 deletions
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