Merge branch 'nz/send-email-headers-are-case-insensitive' into maint

gitster · gitster · commit cea1e2e94c05 · 2013-01-20T17:22:49.000-08:00
When users spell "cc:" in lowercase in the fake "header" in the
trailer part, "git send-email" failed to pick up the addresses from
there. As e-mail headers field names are case insensitive, this
script should follow suit and treat "cc:" and "Cc:" the same way.

* nz/send-email-headers-are-case-insensitive:
  git-send-email: treat field names as case-insensitively
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1285,25 +1285,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, $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'});
@@ -1325,7 +1325,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
`@@ -1285,25 +1285,25 @@ sub send_message {`
`1285`	`1285`	`}`
`1286`	`1286`
`1287`	`1287`	`if (defined $input_format && $input_format eq 'mbox') {`
`1288`		`- if (/^Subject:\s+(.*)$/) {`
	`1288`	`+ if (/^Subject:\s+(.*)$/i) {`
`1289`	`1289`	`$subject = $1;`
`1290`	`1290`	`}`
`1291`		`- elsif (/^From:\s+(.*)$/) {`
	`1291`	`+ elsif (/^From:\s+(.*)$/i) {`
`1292`	`1292`	`($author, $author_encoding) = unquote_rfc2047($1);`
`1293`	`1293`	`next if $suppress_cc{'author'};`
`1294`	`1294`	`next if $suppress_cc{'self'} and $author eq $sender;`
`1295`	`1295`	`printf("(mbox) Adding cc: %s from line '%s'\n",`
`1296`	`1296`	`$1, $_) unless $quiet;`
`1297`	`1297`	`push @cc, $1;`
`1298`	`1298`	`}`
`1299`		`- elsif (/^To:\s+(.*)$/) {`
	`1299`	`+ elsif (/^To:\s+(.*)$/i) {`
`1300`	`1300`	`foreach my $addr (parse_address_line($1)) {`
`1301`	`1301`	`printf("(mbox) Adding to: %s from line '%s'\n",`
`1302`	`1302`	`$addr, $_) unless $quiet;`
`1303`	`1303`	`push @to, $addr;`
`1304`	`1304`	`}`
`1305`	`1305`	`}`
`1306`		`- elsif (/^Cc:\s+(.*)$/) {`
	`1306`	`+ elsif (/^Cc:\s+(.*)$/i) {`
`1307`	`1307`	`foreach my $addr (parse_address_line($1)) {`
`1308`	`1308`	`if (unquote_rfc2047($addr) eq $sender) {`
`1309`	`1309`	`next if ($suppress_cc{'self'});`
`@@ -1325,7 +1325,7 @@ sub send_message {`
`1325`	`1325`	`elsif (/^Message-Id: (.*)/i) {`
`1326`	`1326`	`$message_id = $1;`
`1327`	`1327`	`}`
`1328`		`- elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {`
	`1328`	`+ elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {`
`1329`	`1329`	`push @xh, $_;`
`1330`	`1330`	`}`
`1331`	`1331`