t6200: avoid path mangling issue on Windows

MSYS bash interprets the slash in the argument core.commentchar="/"
as root directory and mangles it into a Windows style path. Use a
different core.commentchar to dodge the issue.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2013-04-18 08:42:25 +02:00 committed by Junio C Hamano
parent 89c3bbd808
commit 16a794de88

View File

@ -184,8 +184,8 @@ test_expect_success '--log=5 with custom comment character' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos}
/ By Another Author (3) and A U Thor (2) x By Another Author (3) and A U Thor (2)
/ Via Another Committer x Via Another Committer
* left: * left:
Left #5 Left #5
Left #4 Left #4
@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' '
Common #1 Common #1
EOF EOF
git -c core.commentchar="/" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual && git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
test_cmp expected actual test_cmp expected actual
' '