]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t4200: convert sed expression which operates on non-text file to perl
authorBrandon Casey <casey@nrlssc.navy.mil>
Wed, 6 May 2009 22:56:18 +0000 (17:56 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2009 23:43:29 +0000 (16:43 -0700)
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>
t/t4200-rerere.sh

index 504802c987f7dc644c63d0e0d0a41275b556d82a..a6bc028a57115729d38e4b228cd259880d0bf6f8 100755 (executable)
@@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' '
        test_must_fail git merge first
 '
 
-sha1=$(sed -e 's/      .*//' .git/MERGE_RR)
+sha1=$(perl -pe 's/    .*//' .git/MERGE_RR)
 rr=.git/rr-cache/$sha1
 test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage"