Browse Source

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>
maint
Bryan Donlan 17 years ago committed by Junio C Hamano
parent
commit
4a7aaccd83
  1. 2
      t/.gitignore
  2. 6
      t/t6200-fmt-merge-msg.sh
  3. 4
      t/test-lib.sh

2
t/.gitignore vendored

@ -1 +1 @@ @@ -1 +1 @@
trash
/trash directory

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

@ -82,14 +82,14 @@ test_expect_success 'merge-msg test #1' ' @@ -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

4
t/test-lib.sh

@ -411,14 +411,14 @@ fi @@ -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]*\)-[^/]*$')

Loading…
Cancel
Save