development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the test trash directory to contain spaces.

Browse source 
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>
This commit is contained in:
Bryan Donlan 2008-05-04 01:38:00 -04:00 committed by Junio C Hamano
parent f69e836fab
commit 4a7aaccd83
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/.gitignore vendored
View file

@ -1 +1 @@
trash /trash directory

6
t/t6200-fmt-merge-msg.sh
View file

@ -82,14 +82,14 @@ test_expect_success 'merge-msg test #1' '
git diff actual expected git diff actual expected
' '
cat >expected <<\EOF cat >expected <<EOF
Merge branch 'left' of ../trash Merge branch 'left' of ../$test
EOF EOF
test_expect_success 'merge-msg test #2' ' test_expect_success 'merge-msg test #2' '
git checkout master && git checkout master &&
git fetch ../trash left && git fetch ../"$test" left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual && git fmt-merge-msg <.git/FETCH_HEAD >actual &&
git diff actual expected git diff actual expected

4
t/test-lib.sh
View file

@ -411,14 +411,14 @@ fi
. ../GIT-BUILD-OPTIONS . ../GIT-BUILD-OPTIONS
# Test repository # Test repository
test=trash test="trash directory"
rm -fr "$test" || { rm -fr "$test" || {
trap - exit trap - exit
echo >&5 "FATAL: Cannot prepare test area" echo >&5 "FATAL: Cannot prepare test area"
exit 1 exit 1
} }
test_create_repo $test test_create_repo "$test"
cd "$test" cd "$test"
this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$') this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$')