diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
commit | 71da2fb077c90d24f3d3b7597cea0393702ec467 (patch) | |
tree | 06612b848c076a55271a2b85b9adbf94bd8d672d /t | |
parent | Merge branch 'jk/t6300-cleanup' into maint (diff) | |
parent | send-email: only allow one address per body tag (diff) | |
download | tgif-71da2fb077c90d24f3d3b7597cea0393702ec467.tar.xz |
Merge branch 'jh/send-email-one-cc' into maint
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
* jh/send-email-one-cc:
send-email: only allow one address per body tag
Diffstat (limited to 't')
-rwxr-xr-x | t/t9001-send-email.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 0f398dd160..60a80f60b2 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -148,7 +148,6 @@ cat >expected-cc <<\EOF !two@example.com! !three@example.com! !four@example.com! -!five@example.com! EOF " @@ -159,9 +158,9 @@ test_expect_success $PREREQ 'cc trailer with various syntax' ' Test Cc: trailers. Cc: one@example.com - Cc: <two@example.com> # this is part of the name - Cc: <three@example.com>, <four@example.com> # not.five@example.com - Cc: "Some # Body" <five@example.com> [part.of.name.too] + 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> ] EOF clean_fake_sendmail && git send-email -1 --to=recipient@example.com \ |