summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2009-05-06 22:56:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-06 23:43:29 (GMT)
commit5e16488edc3cf9d5c30d08fcd9b74525198d6184 (patch)
treed5df11a5cfc7799244d2b83d59a8c4080d5a2a88
parent9eda0e980a43e6bf5167e1b35f457f970bec7b74 (diff)
downloadgit-5e16488edc3cf9d5c30d08fcd9b74525198d6184.zip
git-5e16488edc3cf9d5c30d08fcd9b74525198d6184.tar.gz
git-5e16488edc3cf9d5c30d08fcd9b74525198d6184.tar.bz2
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>
-rwxr-xr-xt/t4200-rerere.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 504802c..a6bc028 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"