Len Brown <len.brown@xxxxxxxxx> writes:
> git-send-email seems to strip out my custom headers.
It seems to not care about anything but a selected few.
Could you give this a try, please?
-- >8 --
git-send-email: do not drop custom headers the user prepared
The command picked up only Subject, CC, and From headers in the
incoming mbox text. Sending out patches prepared by
git-format-patch with user's custom headers was impossible with
that.
Just keep the ones it does not need to look at and add them to
the header of the message when sending it out.
Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
---
diff --git a/git-send-email.perl b/git-send-email.perl
index 4a20310..77e4557 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -83,7 +83,7 @@ # Constants (essentially)
my $compose_filename = ".msg.$$";
# Variables we fill in automatically, or via prompting:
-my (@to,@cc,@initial_cc,@bcclist,
+my (@to,@cc,@initial_cc,@bcclist,@xh,
$initial_reply_to,$initial_subject,@files,$from,$compose,$time);
# Behavior modification variables
@@ -422,6 +422,9 @@ X-Mailer: git-send-email $gitversion
$header .= "In-Reply-To: $reply_to\n";
$header .= "References: $references\n";
}
+ if (@xh) {
+ $header .= join("\n", @xh);
+ }
if ($smtp_server =~ m#^/#) {
my $pid = open my $sm, '|-';
@@ -472,6 +475,7 @@ foreach my $t (@files) {
my $author_not_sender = undef;
@cc = @initial_cc;
+ @xh = ();
my $found_mbox = 0;
my $header_done = 0;
$message = "";
@@ -495,6 +499,9 @@ foreach my $t (@files) {
$2, $_) unless $quiet;
push @cc, $2;
}
+ elsif (/^[-A-Za-z]+:\s+\S/) {
+ push @xh, $_;
+ }
} else {
# In the traditional
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html