t4200: convert sed expression which operates on non-text file to perl
POSIX only requires sed to work on text files and MERGE_RR is not a text file. Some versions of sed complain that this file is not newline terminated, and exit non-zero. Use perl instead which does not have a problem with it. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey committed
May 6, 2009 at 17:56 UTC
5e16488edc3cf9d5c30d08fcd9b74525198d6184
1 file changed
+1
-1
t/t4200-rerere.sh
+1
-1
@@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' '
57
test_must_fail git merge first
58
'
59
60
-sha1=$(sed -e 's/ .*//' .git/MERGE_RR)
60
+sha1=$(perl -pe 's/ .*//' .git/MERGE_RR)
61
rr=.git/rr-cache/$sha1
62
test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage"
63