posix compatibility for t4200

PATCH New Bryan Larsen 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

Bryan Larsen

author

2016-06-15 22:43 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 t/t4200-rerere.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

t/t4200-rerere.sh +1 -1

index 6ba63d7..300e90e 100755
@@ -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"

Signature · 1 line

1.5.1