kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

format-patch tests: check quoting/encoding in To: and Cc: headers 

git-format-patch does currently not parse user supplied extra header
values (e. g., --cc, --add-header) and just replays them. That forces
users to add them RFC 2822/2047 conform in encoded form, e.g.

    --cc '=?UTF-8?q?Jan=20H=2E=20Sch=C3=B6nherr?= <...>'

which is inconvenient. We would want to update git-format-patch to
accept human-readable input

    --cc 'Jan H. Schönherr <...>'

and handle the encoding, wrapping and quoting internally in the future,
similar to what is already done in git-send-email. The necessary code
should mostly exist in the code paths that handle the From: and Subject:
headers.

Whether we want to do this only for the git-format-patch options
--to and --cc (and the corresponding config options) or also for
user supplied headers via --add-header, is open for discussion.

For now, add test_expect_failure tests for To: and Cc: headers as a
reminder and fix tests that would otherwise fail should this get
implemented.

Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jan H. Schönherr 2012-10-18 16:43:34 +02:00 committed by Junio C Hamano
parent 41dd00bad3
commit 25dc8dad3a
1 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
t/t4014-format-patch.sh
View File

@ -110,73 +110,107 @@ test_expect_success 'replay did not screw up the log message' '


test_expect_success 'extra headers' ' test_expect_success 'extra headers' '


git config format.headers "To: R. E. Cipient <rcipient@example.com> git config format.headers "To: R E Cipient <rcipient@example.com>
" && " &&
git config --add format.headers "Cc: S. E. Cipient <scipient@example.com> git config --add format.headers "Cc: S E Cipient <scipient@example.com>
" && " &&
git format-patch --stdout master..side > patch2 && git format-patch --stdout master..side > patch2 &&
sed -e "/^\$/q" patch2 > hdrs2 && sed -e "/^\$/q" patch2 > hdrs2 &&
grep "^To: R. E. Cipient <rcipient@example.com>\$" hdrs2 && grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
grep "^Cc: S. E. Cipient <scipient@example.com>\$" hdrs2 grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2


' '


test_expect_success 'extra headers without newlines' ' test_expect_success 'extra headers without newlines' '


git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" && git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>" && git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
git format-patch --stdout master..side >patch3 && git format-patch --stdout master..side >patch3 &&
sed -e "/^\$/q" patch3 > hdrs3 && sed -e "/^\$/q" patch3 > hdrs3 &&
grep "^To: R. E. Cipient <rcipient@example.com>\$" hdrs3 && grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
grep "^Cc: S. E. Cipient <scipient@example.com>\$" hdrs3 grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3


' '


test_expect_success 'extra headers with multiple To:s' ' test_expect_success 'extra headers with multiple To:s' '


git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" && git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
git config --add format.headers "To: S. E. Cipient <scipient@example.com>" && git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
git format-patch --stdout master..side > patch4 && git format-patch --stdout master..side > patch4 &&
sed -e "/^\$/q" patch4 > hdrs4 && sed -e "/^\$/q" patch4 > hdrs4 &&
grep "^To: R. E. Cipient <rcipient@example.com>,\$" hdrs4 && grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
grep "^ *S. E. Cipient <scipient@example.com>\$" hdrs4 grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
' '


test_expect_success 'additional command line cc' ' test_expect_success 'additional command line cc (ascii)' '


git config --replace-all format.headers "Cc: R. E. Cipient <rcipient@example.com>" && git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
grep "^ *S E Cipient <scipient@example.com>\$" patch5
'

test_expect_failure 'additional command line cc (rfc822)' '

git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 && git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
grep "^Cc: R. E. Cipient <rcipient@example.com>,\$" patch5 && grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
grep "^ *S. E. Cipient <scipient@example.com>\$" patch5 grep "^ *"S. E. Cipient" <scipient@example.com>\$" patch5
' '


test_expect_success 'command line headers' ' test_expect_success 'command line headers' '


git config --unset-all format.headers && git config --unset-all format.headers &&
git format-patch --add-header="Cc: R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 && git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 &&
grep "^Cc: R. E. Cipient <rcipient@example.com>\$" patch6 grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6
' '


test_expect_success 'configuration headers and command line headers' ' test_expect_success 'configuration headers and command line headers' '


git config --replace-all format.headers "Cc: R. E. Cipient <rcipient@example.com>" && git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
git format-patch --add-header="Cc: S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 && git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 &&
grep "^Cc: R. E. Cipient <rcipient@example.com>,\$" patch7 && grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 &&
grep "^ *S. E. Cipient <scipient@example.com>\$" patch7 grep "^ *S E Cipient <scipient@example.com>\$" patch7
' '


test_expect_success 'command line To: header' ' test_expect_success 'command line To: header (ascii)' '


git config --unset-all format.headers && git config --unset-all format.headers &&
git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 && git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
grep "^To: R. E. Cipient <rcipient@example.com>\$" patch8 grep "^To: R E Cipient <rcipient@example.com>\$" patch8
' '


test_expect_success 'configuration To: header' ' test_expect_failure 'command line To: header (rfc822)' '

git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
grep "^To: "R. E. Cipient" <rcipient@example.com>\$" patch8
'

test_expect_failure 'command line To: header (rfc2047)' '

git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
'

test_expect_success 'configuration To: header (ascii)' '

git config format.to "R E Cipient <rcipient@example.com>" &&
git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
grep "^To: R E Cipient <rcipient@example.com>\$" patch9
'

test_expect_failure 'configuration To: header (rfc822)' '


git config format.to "R. E. Cipient <rcipient@example.com>" && git config format.to "R. E. Cipient <rcipient@example.com>" &&
git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
grep "^To: R. E. Cipient <rcipient@example.com>\$" patch9 grep "^To: "R. E. Cipient" <rcipient@example.com>\$" patch9
'

test_expect_failure 'configuration To: header (rfc2047)' '

git config format.to "R Ä Cipient <rcipient@example.com>" &&
git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9
' '


# check_patch <patch>: Verify that <patch> looks like a half-sane # check_patch <patch>: Verify that <patch> looks like a half-sane
@ -190,11 +224,11 @@ check_patch () {
test_expect_success '--no-to overrides config.to' ' test_expect_success '--no-to overrides config.to' '


git config --replace-all format.to \ git config --replace-all format.to \
"R. E. Cipient <rcipient@example.com>" && "R E Cipient <rcipient@example.com>" &&
git format-patch --no-to --stdout master..side | git format-patch --no-to --stdout master..side |
sed -e "/^\$/q" >patch10 && sed -e "/^\$/q" >patch10 &&
check_patch patch10 && check_patch patch10 &&
! grep "^To: R. E. Cipient <rcipient@example.com>\$" patch10 ! grep "^To: R E Cipient <rcipient@example.com>\$" patch10
' '


test_expect_success '--no-to and --to replaces config.to' ' test_expect_success '--no-to and --to replaces config.to' '
@ -212,21 +246,21 @@ test_expect_success '--no-to and --to replaces config.to' '
test_expect_success '--no-cc overrides config.cc' ' test_expect_success '--no-cc overrides config.cc' '


git config --replace-all format.cc \ git config --replace-all format.cc \
"C. E. Cipient <rcipient@example.com>" && "C E Cipient <rcipient@example.com>" &&
git format-patch --no-cc --stdout master..side | git format-patch --no-cc --stdout master..side |
sed -e "/^\$/q" >patch12 && sed -e "/^\$/q" >patch12 &&
check_patch patch12 && check_patch patch12 &&
! grep "^Cc: C. E. Cipient <rcipient@example.com>\$" patch12 ! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12
' '


test_expect_success '--no-add-header overrides config.headers' ' test_expect_success '--no-add-header overrides config.headers' '


git config --replace-all format.headers \ git config --replace-all format.headers \
"Header1: B. E. Cipient <rcipient@example.com>" && "Header1: B E Cipient <rcipient@example.com>" &&
git format-patch --no-add-header --stdout master..side | git format-patch --no-add-header --stdout master..side |
sed -e "/^\$/q" >patch13 && sed -e "/^\$/q" >patch13 &&
check_patch patch13 && check_patch patch13 &&
! grep "^Header1: B. E. Cipient <rcipient@example.com>\$" patch13 ! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13
' '


test_expect_success 'multiple files' ' test_expect_success 'multiple files' '