Skip to content

Commit 5e16488

Browse files
drafnelgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9eda0e9 commit 5e16488

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t4200-rerere.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' '
5757
test_must_fail git merge first
5858
'
5959

60-
sha1=$(sed -e 's/ .*//' .git/MERGE_RR)
60+
sha1=$(perl -pe 's/ .*//' .git/MERGE_RR)
6161
rr=.git/rr-cache/$sha1
6262
test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage"
6363

0 commit comments

Comments
 (0)