diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:27 -0700 |
| commit | 18cd7563d4ad77e6f77f156f80f4092eda4e2735 (patch) | |
| tree | 790f79ebcdcd128d77acb01a4fd599c2c339c8a2 | |
| parent | f4fd906350531c36c48ad45ea1313b864ef26164 (diff) | |
| parent | de404249abc2524dfd0a6b09bbe7723d83cb32a3 (diff) | |
| download | git-18cd7563d4ad77e6f77f156f80f4092eda4e2735.tar.gz | |
Merge branch 'ps/perlless-test-fixes'
Test fixes.
* ps/perlless-test-fixes:
t5333: fix missing terminator for sed(1) 's' command
t4150: fix warning printed by awk due to escaped '\@'
| -rwxr-xr-x | t/t4150-am.sh | 2 | ||||
| -rwxr-xr-x | t/t5333-pseudo-merge-bitmaps.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 2ae93d3c96..699a81ab5c 100755 --- a/t/t4150-am.sh +++ b/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 a/t/t5333-pseudo-merge-bitmaps.sh b/t/t5333-pseudo-merge-bitmaps.sh index ba5ae6a00c..1f7a5d82ee 100755 --- a/t/t5333-pseudo-merge-bitmaps.sh +++ b/t/t5333-pseudo-merge-bitmaps.sh @@ -234,8 +234,8 @@ 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 | - git update-ref --stdin || return 1 + sed "s|\(.*\)|create refs/remotes/$r/tags/\1 \1|" in >refs && + git update-ref --stdin <refs || return 1 done && git \ |