summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorKrzysztof Mazur <krzysiek@podlesie.net>2012-11-22 19:12:08 +0100
committerJunio C Hamano <gitster@pobox.com>2012-11-26 08:16:36 -0800
commit831a488b76e0fcad68c6d1c7aaf9f086199e1738 (patch)
tree88f934df14fe847a88d78eb2f53ef780bd1f2b6e /git-send-email.perl
parente8a1f5a2ae53805986b1b965e036450bdfc0c460 (diff)
downloadgit-831a488b76e0fcad68c6d1c7aaf9f086199e1738.tar.gz
git-send-email: remove garbage after email address
In some cases it is useful to add additional information after the email address on the Cc: footer in a commit log, for instance: "Cc: Stable kernel <stable@vger.kernel.org> #v3.4 v3.5 v3.6" However, git-send-email refuses to pick up such an invalid address when the Email::Valid perl module is available, or just uses the whole line as the email address. In sanitize_address(), remove everything after the email address, so that the result is a valid email address that makes Email::Valid happy. Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net> Tested-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 5a7c29db93..9840d0afca 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -924,6 +924,10 @@ sub quote_subject {
# use the simplest quoting being able to handle the recipient
sub sanitize_address {
my ($recipient) = @_;
+
+ # remove garbage after email address
+ $recipient =~ s/(.*>).*$/$1/;
+
my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)\s*(<.*)/);
if (not $recipient_name) {