Skip to content

Commit

Permalink
t6200: avoid path mangling issue on Windows
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Sixt authored and Junio C Hamano committed Apr 18, 2013
1 parent 89c3bbd commit 16a794d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions t/t6200-fmt-merge-msg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ test_expect_success '--log=5 with custom comment character' '
cat >expected <<-EOF &&
Merge branch ${apos}left${apos}
/ By Another Author (3) and A U Thor (2)
/ Via Another Committer
x By Another Author (3) and A U Thor (2)
x Via Another Committer
* left:
Left #5
Left #4
Expand All @@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' '
Common #1
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
'

Expand Down

0 comments on commit 16a794d

Please sign in to comment.