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>
Johannes Sixt committed
Apr 18, 2013 at 08:42 UTC
16a794de889ecc11ccbcd5ecf998a128d6dbfa97
1 file changed
+3
-3
t/t6200-fmt-merge-msg.sh
+3
-3
@@ -184,8 +184,8 @@ test_expect_success '--log=5 with custom comment character' '
184
cat >expected <<-EOF &&
185
Merge branch ${apos}left${apos}
186
187
- / By Another Author (3) and A U Thor (2)
188
- / Via Another Committer
187
+ x By Another Author (3) and A U Thor (2)
188
+ x Via Another Committer
189
* left:
190
Left #5
191
Left #4
@@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' '
194
Common #1
195
EOF
196
197
- git -c core.commentchar="/" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
197
+ git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
198
test_cmp expected actual
199
'
200