mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
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 '\@'
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user