diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-03-22 21:05:28 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-03-22 18:08:37 -0700 |
| commit | 3007a78033fec09b97ff1ca816a2d23c292dd956 (patch) | |
| tree | 50f1cf14a59d5f3ed7971a8ec58bec1fae97ed87 /t | |
| parent | git-apply: Do not free the wrong buffer when we convert the data for writeout (diff) | |
| download | tgif-3007a78033fec09b97ff1ca816a2d23c292dd956.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4118-apply-empty-context.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh index 690a182003..27cc6f2b88 100755 --- a/t/t4118-apply-empty-context.sh +++ b/t/t4118-apply-empty-context.sh @@ -23,7 +23,8 @@ test_expect_success setup ' cat file2 >file2.orig git add file1 file2 && sed -e "/^B/d" <file1.orig >file1 && - sed -e "/^B/d" <file2.orig >file2 && + sed -e "/^[BQ]/d" <file2.orig >file2 && + echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods && git diff | |