Presently, it works with each header ending with a newline, but not without the newlines. Also add a test to see that multiple "To:" headers get combined. Signed-off-by: Daniel Barkalow <barkalow@xxxxxxxxxxxx> --- t/t4014-format-patch.sh | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index ac78752..28ab7b9 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -88,6 +88,40 @@ test_expect_success 'replay did not screw up the log message' ' ' +test_expect_success 'extra headers' ' + + git config format.headers "To: R. E. Cipient <rcipient@xxxxxxxxxxx> +" && + git config --add format.headers "Cc: S. E. Cipient <scipient@xxxxxxxxxxx> +" && + git format-patch --stdout master..side > patch2 && + sed -e "/^$/Q" patch2 > hdrs2 && + grep "^To: R. E. Cipient <rcipient@xxxxxxxxxxx>$" hdrs2 && + grep "^Cc: S. E. Cipient <scipient@xxxxxxxxxxx>$" hdrs2 + +' + +test_expect_failure 'extra headers without newlines' ' + + git config --replace-all format.headers "To: R. E. Cipient <rcipient@xxxxxxxxxxx>" && + git config --add format.headers "Cc: S. E. Cipient <scipient@xxxxxxxxxxx>" && + git format-patch --stdout master..side >patch3 && + sed -e "/^$/Q" patch3 > hdrs3 && + grep "^To: R. E. Cipient <rcipient@xxxxxxxxxxx>$" hdrs3 && + grep "^Cc: S. E. Cipient <scipient@xxxxxxxxxxx>$" hdrs3 + +' + +test_expect_failure 'extra headers with multiple To:s' ' + + git config --replace-all format.headers "To: R. E. Cipient <rcipient@xxxxxxxxxxx>" && + git config --add format.headers "To: S. E. Cipient <scipient@xxxxxxxxxxx>" && + git format-patch --stdout master..side > patch4 && + sed -e "/^$/Q" patch4 > hdrs4 && + grep "^To: R. E. Cipient <rcipient@xxxxxxxxxxx>,$" hdrs4 && + grep "^ *S. E. Cipient <scipient@xxxxxxxxxxx>$" hdrs4 +' + test_expect_success 'multiple files' ' rm -rf patches/ && -- 1.5.4.1.192.g8ea3a - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
