Re: [PATCH v4 12/20] t: refactor tests depending on Perl to print data
---
* I hear Patrick is ooo and this breakage might not be grave enough
for a hotfix. But just in case...
t/t4150-am.sh | 2 +-
t/t5333-pseudo-merge-bitmaps.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git c/t/t4150-am.sh w/t/t4150-am.sh
index 2ae93d3c96..699a81ab5c 100755
--- c/t/t4150-am.sh
+++ w/t/t4150-am.sh
@@ -1086,7 +1086,7 @@ test_expect_success 'am works with multi-line in-body headers' '
# bump from, date, and subject down to in-body header
awk "
/^From:/{
- print \"From: x <x\@example.com>\";
+ print \"From: x <x@example.com>\";
print \"Date: Sat, 1 Jan 2000 00:00:00 +0000\";
print \"Subject: x\n\";
}; 1
diff --git c/t/t5333-pseudo-merge-bitmaps.sh w/t/t5333-pseudo-merge-bitmaps.sh
index 56674db562..de0dc7c412 100755
--- c/t/t5333-pseudo-merge-bitmaps.sh
+++ w/t/t5333-pseudo-merge-bitmaps.sh
@@ -221,7 +221,7 @@ test_expect_success 'out of order thresholds are rejected' '
test_cmp expect err
'
-test_expect_success 'pseudo-merge pattern with capture groups' '
+test_expect_success PERL_TEST_HELPERS 'pseudo-merge pattern with capture groups' '
git init pseudo-merge-captures &&
(
cd pseudo-merge-captures &&
@@ -234,7 +234,7 @@ test_expect_success 'pseudo-merge pattern with capture groups' '
test_commit_bulk 16 &&
git rev-list HEAD~16.. >in &&
- sed "s|\(.*\)|create refs/remotes/$r/tags/\1 \1" in |
+ perl -lne "print \"create refs/remotes/$r/tags/\$. \$_\"" <in |
git update-ref --stdin || return 1
done &&
@@ -250,7 +250,7 @@ test_expect_success 'pseudo-merge pattern with capture groups' '
do
test_pseudo_merge_commits $m >oids &&
grep -f oids refs |
- sed -n "s|refs/remotes/\([0-9][0-9]*\)/|\1|p" &&
+ perl -lne "print \$1 if /refs\/remotes\/([0-9]+)/" |
sort -u || return 1
done >remotes &&
Junio C Hamano <gitster@pobox.com>