From: Bryan Larsen Date: Wed, 02 May 2007 21:53:23 GMT Subject: [PATCH] posix compatibility for t4200 Message-ID: <46390853.2030306@larsen.st> Fix t4200 so that it also works on OS X by not relying on gnu extensions to sed. Signed-off-by: Bryan Larsen --- t/t4200-rerere.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 6ba63d7..300e90e 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -44,7 +44,7 @@ mkdir .git/rr-cache test_expect_failure 'conflicting merge' 'git pull . first' -sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR) +sha1=$(sed -e 's/[[:space:]].*//' .git/rr-cache/MERGE_RR) rr=.git/rr-cache/$sha1 test_expect_success 'recorded preimage' "grep ======= $rr/preimage" -- 1.5.1