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 <Johannes.Schindelin@gmx.de> Ack'd-by: Elias Pipping <pipping@macports.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin committed
Mar 22, 2007 at 21:05 UTC
3007a78033fec09b97ff1ca816a2d23c292dd956
1 file changed
+2
-1
t/t4118-apply-empty-context.sh
+2
-1
@@ -23,7 +23,8 @@ test_expect_success setup '
23
cat file2 >file2.orig
24
git add file1 file2 &&
25
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 &&
28
cat file1 >file1.mods &&
29
cat file2 >file2.mods &&
30
git diff |