Skip to contentSkip to conversation

send-email: avoid duplicate In-Reply-To and References headers

RFC In review Eric Wong 2 participants 4 messages Feb 12, 2017

lore
Share & tools
lore

Eric Wong

author
#0 lore raw

RFC 1/1 send-email: avoid duplicate In-Reply-To and References headers

When parsing an mbox, it is possible to get existing In-Reply-To and References headers blindly appended into the headers of
message we generate. This is probably the wrong thing to do
and we should prioritize what was given in the command-line, cover letter, and previously-sent messages.

One example I've noticed in the wild was:

https://public-inbox.org/git/[email protected]/raw
---
I'm not completely sure this is what Vasco was doing in that message, so it's an RFC for now...

 git-send-email.perl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
git-send-email.perl +7 -1
index 068d60b3e6..5ab3d8585c 100755
@@ -1543,7 +1543,13 @@ foreach my $t (@files) {
 			elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
 				push @xh, $_;
 			}
-
+			elsif (/^(?:References|In-Reply-To):/i) {
+				if (defined $initial_reply_to || $thread) {
+					warn
+"Ignoring $_ header in mbox body since it conflicts with\n
+--in-reply-to and --thread switches\n"
+				}
+			}
 		} else {
 			# In the traditional
 			# "send lots of email" format,
Signature · 1 line
EW
#1 lore raw
Quoted 6 lines · Eric Wong

When parsing an mbox, it is possible to get existing In-Reply-To and References headers blindly appended into the headers of
message we generate. This is probably the wrong thing to do
and we should prioritize what was given in the command-line, cover letter, and previously-sent messages.

Quoted 6 lines

One example I've noticed in the wild was:

https://public-inbox.org/git/[email protected]/raw
---
I'm not completely sure this is what Vasco was doing in that message, so it's an RFC for now...

I think it is sensibleto give priority to the --in-reply-to option given from the command line over the in-file one. I am not sure if we want to drop references, though. Wouldn't it make more sense to just add what we got from the command line to what we read from the file? I dunno.

Quoted 22 lines
 git-send-email.perl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
git-send-email.perl +7 -1
index 068d60b3e6..5ab3d8585c 100755
@@ -1543,7 +1543,13 @@ foreach my $t (@files) {
 			elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
 				push @xh, $_;
 			}
-
+			elsif (/^(?:References|In-Reply-To):/i) {
+				if (defined $initial_reply_to || $thread) {
+					warn
+"Ignoring $_ header in mbox body since it conflicts with\n
+--in-reply-to and --thread switches\n"
+				}
+			}
 		} else {
 			# In the traditional
 			# "send lots of email" format,
author
#2 lore raw
Quoted 14 lines · Junio C Hamano
Quoted 6 lines · Eric Wong

When parsing an mbox, it is possible to get existing In-Reply-To and References headers blindly appended into the headers of
message we generate. This is probably the wrong thing to do
and we should prioritize what was given in the command-line, cover letter, and previously-sent messages.

Quoted 6 lines

One example I've noticed in the wild was:

https://public-inbox.org/git/[email protected]/raw
---
I'm not completely sure this is what Vasco was doing in that message, so it's an RFC for now...

Quoted 5 lines

I think it is sensibleto give priority to the --in-reply-to option given from the command line over the in-file one. I am not sure if we want to drop references, though. Wouldn't it make more sense to just add what we got from the command line to what we read from the file? I dunno.

You're right, existing References in the bodies should probably be prepended to current ones, as their order should be oldest-to-newest.

I'll wait on comments a bit and work on a better version w/ tests next week.

#3 lore raw
Quoted 11 lines · Eric Wong
Quoted 6 lines · Junio C Hamano

I think it is sensibleto give priority to the --in-reply-to option given from the command line over the in-file one. I am not sure if we want to drop references, though. Wouldn't it make more sense to just add what we got from the command line to what we read from the file? I dunno.

You're right, existing References in the bodies should probably be prepended to current ones, as their order should be oldest-to-newest.

If you were to go that way, it may also make sense to demote the original In-Reply-To you find in the file to an entry in the References list, if it does not already appear there.

I didn't check the RFCs, but I think your original motivation is to ensure that there is not more than one messages to which the current message is replying to, iow, to ensure that there is only one message that is In-Reply-To, so appending would not be a good solution there.