Skip to content

Commit 16a794d

Browse files
j6tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 89c3bbd commit 16a794d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t6200-fmt-merge-msg.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ test_expect_success '--log=5 with custom comment character' '
184184
cat >expected <<-EOF &&
185185
Merge branch ${apos}left${apos}
186186
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
189189
* left:
190190
Left #5
191191
Left #4
@@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' '
194194
Common #1
195195
EOF
196196
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 &&
198198
test_cmp expected actual
199199
'
200200

0 commit comments

Comments
 (0)