summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2016-10-13 07:47:27 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-14 10:06:09 -0700
commite3fdbcc8e16474f50749a384175f78908c4f038e (patch)
tree9091e11db7d4c5ba0b8440bb1c18cb2875560a7e /git-merge-octopus.sh
parentsend-email: suppress meaningless whitespaces in from field (diff)
downloadtgif-e3fdbcc8e16474f50749a384175f78908c4f038e.tar.xz
parse_mailboxes: accept extra text after <...> address
The test introduced in this commit succeeds without the patch to Git.pm if Mail::Address is installed, but fails otherwise because our in-house parser does not accept any text after the email address. They succeed both with and without Mail::Address after this commit. Mail::Address accepts extra text and considers it as part of the name, iff the address is surrounded with <...>. The implementation mimics this behavior as closely as possible. This mostly restores the behavior we had before b1c8a11 (send-email: allow multiple emails using --cc, --to and --bcc, 2015-06-30), but we keep the possibility to handle comma-separated lists. Reported-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions