t6200: avoid path mangling issue on Windows
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Apr 18, 2013, 06:42 UTC
- Message-ID
- <516F95D1.5070209@viscovery.net>
- In-Reply-To
- <1365348344-1648-2-git-send-email-ralf.thielow@gmail.com>
From: Johannes Sixt <j6t@kdbg.org>
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> --- t/t6200-fmt-merge-msg.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index e7e945d..54b5744 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -179,8 +179,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 @@ -189,7 +189,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 '
-- 1.8.2.1.1678.gf713add