diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-08-23 03:02:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-23 03:04:01 -0700 |
| commit | 68d42c41ef33cde500307660bb64a1c74f62711e (patch) | |
| tree | cf7a05a9c7fe66a174932ae32e6d71e5a71720c4 | |
| parent | 44c10841ea3edeef47cc6be0fdba5058344e2e95 (diff) | |
| download | git-68d42c41ef33cde500307660bb64a1c74f62711e.tar.gz git-68d42c41ef33cde500307660bb64a1c74f62711e.tar.xz | |
git-send-email: Don't set author_not_sender from Cc: lines
When an mbox-style patch contains a Cc: line in the header,
git-send-email will check the address against the sender specified
on the command line. If they don't match, sender_not_author will
be set to the address obtained from the Cc line.
When this happens, git-send-email inserts a From: line at the
beginning of the message body with the address obtained from the
Cc line in the header, and the sender might be accused of forging
patch authors.
This patch fixes this by only updating sender_not_author when
processing From: lines, not when processing Cc: lines.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index a83c7e909..746c52507 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -510,7 +510,7 @@ foreach my $t (@files) { if ($2 eq $from) { next if ($suppress_from); } - else { + elsif ($1 eq 'From') { $author_not_sender = $2; } printf("(mbox) Adding cc: %s from line '%s'\n", |