From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Wed, 6 May 2009 22:56:18 +0000 (-0500)
Subject: t4200: convert sed expression which operates on non-text file to perl
X-Git-Tag: v1.6.3~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e16488edc3cf9d5c30d08fcd9b74525198d6184;p=git.git

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>
---

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 504802c98..a6bc028a5 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -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"