1. Stefan Saasen
  2. git


bryanlarsen  committed c256acb

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>

  • Participants
  • Parent commits e4e92b3
  • Branches master

Comments (0)

Files changed (1)

File t/t4200-rerere.sh

View file
 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)
 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"