Skip to content

Commit 18cd756

Browse files
committed
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 '\@'
2 parents f4fd906 + de40424 commit 18cd756

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

t/t4150-am.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ test_expect_success 'am works with multi-line in-body headers' '
10861086
# bump from, date, and subject down to in-body header
10871087
awk "
10881088
/^From:/{
1089-
print \"From: x <x\@example.com>\";
1089+
print \"From: x <[email protected]>\";
10901090
print \"Date: Sat, 1 Jan 2000 00:00:00 +0000\";
10911091
print \"Subject: x\n\";
10921092
}; 1

t/t5333-pseudo-merge-bitmaps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ test_expect_success 'pseudo-merge pattern with capture groups' '
234234
test_commit_bulk 16 &&
235235
236236
git rev-list HEAD~16.. >in &&
237-
sed "s|\(.*\)|create refs/remotes/$r/tags/\1 \1" in |
238-
git update-ref --stdin || return 1
237+
sed "s|\(.*\)|create refs/remotes/$r/tags/\1 \1|" in >refs &&
238+
git update-ref --stdin <refs || return 1
239239
done &&
240240
241241
git \

0 commit comments

Comments
 (0)