Git fork

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 '\@'

+3 -3
+1 -1
t/t4150-am.sh
··· 1086 1086 # bump from, date, and subject down to in-body header 1087 1087 awk " 1088 1088 /^From:/{ 1089 - print \"From: x <x\@example.com>\"; 1089 + print \"From: x <x@example.com>\"; 1090 1090 print \"Date: Sat, 1 Jan 2000 00:00:00 +0000\"; 1091 1091 print \"Subject: x\n\"; 1092 1092 }; 1
+2 -2
t/t5333-pseudo-merge-bitmaps.sh
··· 234 234 test_commit_bulk 16 && 235 235 236 236 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 239 239 done && 240 240 241 241 git \