Merge branch 'nb/send-email-no-dup-reply-to'

gitster · gitster · commit d235f69ae880 · 2025-09-29T11:40:33.000-07:00
"git send-email --compose --reply-to=&lt;address&gt;" used to add
duplicated Reply-To: header, which made mailservers unhappy.  This
has been corrected.

* nb/send-email-no-dup-reply-to:
  send-email: don't duplicate Reply-to: in intro message
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1954,6 +1954,9 @@ sub pre_process_file {
 					$in_reply_to = $1;
 				}
 			}
+			elsif (/^Reply-To: (.*)/i) {
+				$reply_to = $1;
+			}
 			elsif (/^References: (.*)/i) {
 				if (!$initial_in_reply_to || $thread) {
 					$references = $1;

Original file line number	Diff line number	Diff line change
`@@ -1954,6 +1954,9 @@ sub pre_process_file {`
`1954`	`1954`	`$in_reply_to = $1;`
`1955`	`1955`	`}`
`1956`	`1956`	`}`
	`1957`	`+ elsif (/^Reply-To: (.*)/i) {`
	`1958`	`+ $reply_to = $1;`
	`1959`	`+ }`
`1957`	`1960`	`elsif (/^References: (.*)/i) {`
`1958`	`1961`	`if (!$initial_in_reply_to \|\| $thread) {`
`1959`	`1962`	`$references = $1;`