diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:58 +0900 |
| commit | 05e408dd1aaa45d3c74e201bc218f65c3f93d99b (patch) | |
| tree | af0e49969791e1c8183a09cba39e2dfeac9ec833 /t | |
| parent | 6c9d19598d67008584132103f083a8badbd90d19 (diff) | |
| parent | cc9075067776ebd34cc08f31bf78bb05f12fd879 (diff) | |
| download | git-05e408dd1aaa45d3c74e201bc218f65c3f93d99b.tar.gz | |
Merge branch 'mm/send-email-cc-cruft' into maint
In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft"
was taught to "git send-email" as a valid way to tell it that it
needs to also send a carbon copy to <a@dd.re.ss> in the trailer
section.
* mm/send-email-cc-cruft:
send-email: don't use Mail::Address, even if available
send-email: fix garbage removal after address
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9001-send-email.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index d1e4e8ad19..f30980895c 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -148,6 +148,8 @@ cat >expected-cc <<\EOF !two@example.com! !three@example.com! !four@example.com! +!five@example.com! +!six@example.com! EOF " @@ -161,6 +163,8 @@ test_expect_success $PREREQ 'cc trailer with various syntax' ' Cc: <two@example.com> # trailing comments are ignored Cc: <three@example.com>, <not.four@example.com> one address per line Cc: "Some # Body" <four@example.com> [ <also.a.comment> ] + Cc: five@example.com # not.six@example.com + Cc: six@example.com, not.seven@example.com EOF clean_fake_sendmail && git send-email -1 --to=recipient@example.com \ |