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>
This commit is contained in:
parent
f69e836fab
commit
4a7aaccd83
2
t/.gitignore
vendored
2
t/.gitignore
vendored
@ -1 +1 @@
|
|||||||
trash
|
/trash directory
|
||||||
|
@ -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
|
||||||
|
@ -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]*\)-[^/]*$')
|
||||||
|
Loading…
Reference in New Issue
Block a user