t4200: convert sed expression which operates on non-text file to perl

drafnel · gitster · commit 5e16488edc3c · 2009-05-06T16:43:29.000-07:00
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 &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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"
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' '`
`57`	`57`	`test_must_fail git merge first`
`58`	`58`	`'`
`59`	`59`
`60`		`-sha1=$(sed -e 's/ .*//' .git/MERGE_RR)`
	`60`	`+sha1=$(perl -pe 's/ .*//' .git/MERGE_RR)`
`61`	`61`	`rr=.git/rr-cache/$sha1`
`62`	`62`	`test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage"`
`63`	`63`