diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-18 04:49:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-18 04:49:42 (GMT) |
| commit | bd8ff616c998da8b08bd59b47644408048b3016d (patch) | |
| tree | 8eb558ca8a38099a96ed75ed922a4377010666da /git-send-email.perl | |
| parent | 34454e858d2a648b0a6ce56acd9def84bd2a8712 (diff) | |
| parent | 4f3d37035a7c735a3b69f962656819f4ff7e4927 (diff) | |
| download | git-bd8ff616c998da8b08bd59b47644408048b3016d.zip git-bd8ff616c998da8b08bd59b47644408048b3016d.tar.gz git-bd8ff616c998da8b08bd59b47644408048b3016d.tar.bz2 | |
Merge branch 'maint'
* maint:
git-send-email: avoid duplicate message-ids
clone: correctly report http_fetch errors
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 1d6f466..248d035 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -580,7 +580,7 @@ sub send_message $ccline = "\nCc: $cc"; } my $sanitized_sender = sanitize_address($sender); - make_message_id(); + make_message_id() unless defined($message_id); my $header = "From: $sanitized_sender To: $to${ccline} @@ -718,6 +718,9 @@ foreach my $t (@files) { } push @xh, $_; } + elsif (/^Message-Id: (.*)/i) { + $message_id = $1; + } elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) { push @xh, $_; } @@ -805,6 +808,7 @@ foreach my $t (@files) { $references = "$message_id"; } } + $message_id = undef; } if ($compose) { |