Skip to content

Commit

Permalink
t4200: convert sed expression which operates on non-text file to perl
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brandon Casey authored and Junio C Hamano committed May 6, 2009
1 parent 9eda0e9 commit 5e16488
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t4200-rerere.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 5e16488

Please sign in to comment.