diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2013-04-18 06:42:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 16:56:37 (GMT) |
| commit | 16a794de889ecc11ccbcd5ecf998a128d6dbfa97 (patch) | |
| tree | fd6f8257059e71d290ffad3e74b74686fe66917e /t/t6200-fmt-merge-msg.sh | |
| parent | 89c3bbd808b352a9f4047523b81b72f22eefb868 (diff) | |
| download | git-16a794de889ecc11ccbcd5ecf998a128d6dbfa97.zip git-16a794de889ecc11ccbcd5ecf998a128d6dbfa97.tar.gz git-16a794de889ecc11ccbcd5ecf998a128d6dbfa97.tar.bz2 | |
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>
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 84e10fd..ff82640 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -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 @@ -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 ' |