Skip to content

Commit 75c962c

Browse files
dschoJunio C Hamano
authored andcommitted
t4118: be nice to non-GNU sed
Elias Pipping: > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes > t4118 fail. Signed-off-by: Johannes Schindelin <[email protected]> Ack'd-by: Elias Pipping <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d3e41eb commit 75c962c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t4118-apply-empty-context.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ test_expect_success setup '
2323
cat file2 >file2.orig
2424
git add file1 file2 &&
2525
sed -e "/^B/d" <file1.orig >file1 &&
26-
sed -e "/^B/d" <file2.orig >file2 &&
26+
sed -e "/^[BQ]/d" <file2.orig >file2 &&
27+
echo Q | tr -d "\\012" >>file2 &&
2728
cat file1 >file1.mods &&
2829
cat file2 >file2.mods &&
2930
git diff |

0 commit comments

Comments
 (0)