Some versions of sed (like the one on Solaris) don't like to match literal tabs, and simply print nothing. Instead, let's use cut. Signed-off-by: Jeff King <peff@xxxxxxxx> --- 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 3cbfee7..d3dea2a 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -53,7 +53,7 @@ test_expect_success 'conflicting merge' ' ! git merge first ' -sha1=$(sed -e 's/ .*//' .git/rr-cache/MERGE_RR) +sha1=$(cut -d' ' -f1 .git/rr-cache/MERGE_RR) rr=.git/rr-cache/$sha1 test_expect_success 'recorded preimage' "grep ======= $rr/preimage" -- 1.5.4.4.543.g30fdd.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
