Skip to content

Commit

Permalink
posix compatibility for t4200
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bryan Larsen authored and Junio C Hamano committed May 4, 2007
1 parent e4e92b3 commit c256acb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t4200-rerere.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit c256acb

Please sign in to comment.