git-send-email: treat field names as case-insensitively

zeldovich · gitster · commit 6310071abfdf · 2013-01-06T23:48:12.000-08:00
Field names like To:, Cc:, etc. are case-insensitive; use a
case-insensitive regexp to match them as such.

Previously, git-send-email would fail to pick-up the addresses when
in-body "fake" headers with different cases (e.g. lowercase "cc:")
are manually inserted to the messages it was asked to send, even
though the text will still show them.

Signed-off-by: Nickolai Zeldovich &lt;nickolai@csail.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1227,25 +1227,25 @@ sub send_message {
 		}
 
 		if (defined $input_format && $input_format eq 'mbox') {
-			if (/^Subject:\s+(.*)$/) {
+			if (/^Subject:\s+(.*)$/i) {
 				$subject = $1;
 			}
-			elsif (/^From:\s+(.*)$/) {
+			elsif (/^From:\s+(.*)$/i) {
 				($author, $author_encoding) = unquote_rfc2047($1);
 				next if $suppress_cc{'author'};
 				next if $suppress_cc{'self'} and $author eq $sender;
 				printf("(mbox) Adding cc: %s from line '%s'\n",
 					$1, $_) unless $quiet;
 				push @cc, $1;
 			}
-			elsif (/^To:\s+(.*)$/) {
+			elsif (/^To:\s+(.*)$/i) {
 				foreach my $addr (parse_address_line($1)) {
 					printf("(mbox) Adding to: %s from line '%s'\n",
 						$addr, $_) unless $quiet;
 					push @to, sanitize_address($addr);
 				}
 			}
-			elsif (/^Cc:\s+(.*)$/) {
+			elsif (/^Cc:\s+(.*)$/i) {
 				foreach my $addr (parse_address_line($1)) {
 					if (unquote_rfc2047($addr) eq $sender) {
 						next if ($suppress_cc{'self'});
@@ -1267,7 +1267,7 @@ sub send_message {
 			elsif (/^Message-Id: (.*)/i) {
 				$message_id = $1;
 			}
-			elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {
+			elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
 				push @xh, $_;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1227,25 +1227,25 @@ sub send_message {`
`1227`	`1227`	`}`
`1228`	`1228`
`1229`	`1229`	`if (defined $input_format && $input_format eq 'mbox') {`
`1230`		`- if (/^Subject:\s+(.*)$/) {`
	`1230`	`+ if (/^Subject:\s+(.*)$/i) {`
`1231`	`1231`	`$subject = $1;`
`1232`	`1232`	`}`
`1233`		`- elsif (/^From:\s+(.*)$/) {`
	`1233`	`+ elsif (/^From:\s+(.*)$/i) {`
`1234`	`1234`	`($author, $author_encoding) = unquote_rfc2047($1);`
`1235`	`1235`	`next if $suppress_cc{'author'};`
`1236`	`1236`	`next if $suppress_cc{'self'} and $author eq $sender;`
`1237`	`1237`	`printf("(mbox) Adding cc: %s from line '%s'\n",`
`1238`	`1238`	`$1, $_) unless $quiet;`
`1239`	`1239`	`push @cc, $1;`
`1240`	`1240`	`}`
`1241`		`- elsif (/^To:\s+(.*)$/) {`
	`1241`	`+ elsif (/^To:\s+(.*)$/i) {`
`1242`	`1242`	`foreach my $addr (parse_address_line($1)) {`
`1243`	`1243`	`printf("(mbox) Adding to: %s from line '%s'\n",`
`1244`	`1244`	`$addr, $_) unless $quiet;`
`1245`	`1245`	`push @to, sanitize_address($addr);`
`1246`	`1246`	`}`
`1247`	`1247`	`}`
`1248`		`- elsif (/^Cc:\s+(.*)$/) {`
	`1248`	`+ elsif (/^Cc:\s+(.*)$/i) {`
`1249`	`1249`	`foreach my $addr (parse_address_line($1)) {`
`1250`	`1250`	`if (unquote_rfc2047($addr) eq $sender) {`
`1251`	`1251`	`next if ($suppress_cc{'self'});`
`@@ -1267,7 +1267,7 @@ sub send_message {`
`1267`	`1267`	`elsif (/^Message-Id: (.*)/i) {`
`1268`	`1268`	`$message_id = $1;`
`1269`	`1269`	`}`
`1270`		`- elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {`
	`1270`	`+ elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {`
`1271`	`1271`	`push @xh, $_;`
`1272`	`1272`	`}`
`1273`	`1273`