From: Bryan Larsen <bryan@larsen.st>
Date: Wed, 2 May 2007 21:53:23 +0000 (-0400)
Subject: posix compatibility for t4200
X-Git-Tag: v1.5.2-rc2~5^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c256acb8fbd0ac1dddb6ec39aa9b3c816493122c;p=git.git

posix compatibility for t4200

Fix t4200 so that it also works on OS X by not relying on gnu
extensions to sed.

Signed-off-by: Bryan Larsen <bryan@larsen.st>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 6ba63d717..c64ebbb2e 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/	.*//' .git/rr-cache/MERGE_RR)
 rr=.git/rr-cache/$sha1
 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"