From: Tom Russello <tom.russello@xxxxxxxxxxxxxxxx>
---
Documentation/git-send-email.txt | 3 +
git-send-email.perl | 70 ++++++++++++++++++++++-
t/t9001-send-email.sh | 117 +++++++++++++++++++++++++--------------
3 files changed, 147 insertions(+), 43 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index bac9014ac..710b5ff32 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -106,6 +106,9 @@ illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:
Only necessary if --compose is also set. If --compose
is not set, this will be prompted for.
+--quote-email=<email_file>::
+ Fill appropriately header fields for the reply to the given email.
+
--subject=<string>::
Specify the initial subject of the email thread.
Only necessary if --compose is also set. If --compose
diff --git a/git-send-email.perl b/git-send-email.perl
index 2208dcc21..665c47d15 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -57,6 +57,7 @@ git send-email --dump-aliases
--[no-]bcc <str> * Email Bcc:
--subject <str> * Email "Subject:"
--in-reply-to <str> * Email "In-Reply-To:"
+ --quote-email <file> * Populate header fields appropriately.
--[no-]xmailer * Add "X-Mailer:" header (default).
--[no-]annotate * Review each patch that will be sent in an editor.
--compose * Open an editor for introduction.
@@ -166,7 +167,7 @@ my $re_encoded_word = qr/=\?($re_token)\?($re_token)\?($re_encoded_text)\?=/;
# Variables we fill in automatically, or via prompting:
my (@to,$no_to,@initial_to,@cc,$no_cc,@initial_cc,@bcclist,$no_bcc,@xh,
- $initial_reply_to,$initial_subject,@files,
+ $initial_reply_to,$initial_references,$quote_email,$initial_subject,@files,
$author,$sender,$smtp_authpass,$annotate,$use_xmailer,$compose,$time);
my $envelope_sender;
@@ -316,6 +317,7 @@ $rc = GetOptions(
"sender|from=s" => \$sender,
"in-reply-to=s" => \$initial_reply_to,
"subject=s" => \$initial_subject,
+ "quote-email=s" => \$quote_email,
"to=s" => \@initial_to,
"to-cmd=s" => \$to_cmd,
"no-to" => \$no_to,
@@ -652,6 +654,70 @@ if (@files) {
usage();
}
+if ($quote_email) {
+ my $error = validate_patch($quote_email);
+ die "fatal: $quote_email: $error\nwarning: no patches were sent\n"
+ if $error;
+
+ my @header = ();
+
+ open my $fh, "<", $quote_email or die "can't open file $quote_email";
+
+ # Get the email header
+ while (<$fh>) {
+ # Turn crlf line endings into lf-only
+ s/\r//g;
+ last if /^\s*$/;
+ if (/^\s+\S/ and @header) {
+ chomp($header[$#header]);
+ s/^\s+/ /;
+ $header[$#header] .= $_;
+ } else {
+ push(@header, $_);
+ }
+ }
+
+ # Parse the header
+ foreach (@header) {
+ my $initial_sender = $sender || $repoauthor || $repocommitter || '';
+
+ chomp;
+
+ if (/^Subject:\s+(.*)$/i) {
+ my $prefix_re = "";
+ my $subject_re = $1;
+ if ($1 =~ /^[^Re:]/) {
+ $prefix_re = "Re: ";
+ }
+ $initial_subject = $prefix_re . $subject_re;
+ } elsif (/^From:\s+(.*)$/i) {
+ push @initial_to, $1;
+ } elsif (/^To:\s+(.*)$/i) {
+ foreach my $addr (parse_address_line($1)) {
+ if (!($addr eq $initial_sender)) {
+ push @initial_cc, $addr;
+ }
+ }
+ } elsif (/^Cc:\s+(.*)$/i) {
+ foreach my $addr (parse_address_line($1)) {
+ my $qaddr = unquote_rfc2047($addr);
+ my $saddr = sanitize_address($qaddr);
+ if ($saddr eq $initial_sender) {
+ next if ($suppress_cc{'self'});
+ } else {
+ next if ($suppress_cc{'cc'});
+ }
+ push @initial_cc, $addr;
+ }
+ } elsif (/^Message-Id: (.*)/i) {
+ $initial_reply_to = $1;
+ } elsif (/^References:\s+(.*)/i) {
+ $initial_references = $1;
+ }
+ }
+ $initial_references = $initial_references . $initial_reply_to;
+}
+
sub get_patch_subject {
my $fn = shift;
open (my $fh, '<', $fn);
@@ -1488,7 +1554,7 @@ EOF
}
$reply_to = $initial_reply_to;
-$references = $initial_reply_to || '';
+$references = $initial_references || $initial_reply_to || '';
$subject = $initial_subject;
$message_num = 0;
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index f30980895..ce12a1164 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1917,52 +1917,87 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
test_cmp expected-list actual-list
'
-test_expect_success $PREREQ 'invoke hook' '
- mkdir -p .git/hooks &&
-
- write_script .git/hooks/sendemail-validate <<-\EOF &&
- # test that we have the correct environment variable, pwd, and
- # argument
- case "$GIT_DIR" in
- *.git)
- true
- ;;
- *)
- false
- ;;
- esac &&
- test -f 0001-add-master.patch &&
- grep "add master" "$1"
- EOF
-
- mkdir subdir &&
- (
- # Test that it works even if we are not at the root of the
- # working tree
- cd subdir &&
- git send-email \
- --from="Example <nobody@xxxxxxxxxxx>" \
- --to=nobody@xxxxxxxxxxx \
- --smtp-server="$(pwd)/../fake.sendmail" \
- ../0001-add-master.patch &&
+test_expect_success $PREREQ 'setup expect' '
+ cat >email <<-\EOF
+ Subject: subject goes here
+ From: author@xxxxxxxxxxx
+ To: to1@xxxxxxxxxxx
+ Cc: cc1@xxxxxxxxxxx, cc2@xxxxxxxxxxx,
+ cc3@xxxxxxxxxxx
+ Date: Sat, 12 Jun 2010 15:53:58 +0200
+ Message-Id: <author_123456@xxxxxxxxxxx>
+ References: <firstauthor_654321@xxxxxxxxxxx>
+ <secondauthor_01546567@xxxxxxxxxxx>
+ <thirdauthor_1395838@xxxxxxxxxxx>
- # Verify error message when a patch is rejected by the hook
- sed -e "s/add master/x/" ../0001-add-master.patch >../another.patch &&
- git send-email \
- --from="Example <nobody@xxxxxxxxxxx>" \
- --to=nobody@xxxxxxxxxxx \
- --smtp-server="$(pwd)/../fake.sendmail" \
- ../another.patch 2>err
- test_i18ngrep "rejected by sendemail-validate hook" err
- )
+ Have you seen my previous email?
+ > Previous content
+ EOF
'
-test_expect_success $PREREQ 'test that send-email works outside a repo' '
- nongit git send-email \
+test_expect_success $PREREQ 'Fields with --quote-email are correct' '
+ clean_fake_sendmail &&
+ git send-email \
+ --quote-email=email \
--from="Example <nobody@xxxxxxxxxxx>" \
- --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
- "$(pwd)/0001-add-master.patch"
+ -1 \
+ 2>errors &&
+ grep "From: Example <nobody@xxxxxxxxxxx>" msgtxt1 &&
+ grep "In-Reply-To: <author_123456@xxxxxxxxxxx>" msgtxt1 &&
+ to_adr=$(awk "/^To: /{flag=1}/^Cc: /{flag=0} flag {print}" msgtxt1) &&
+ cc_adr=$(awk "/^Cc: /{flag=1}/^Subject: /{flag=0} flag {print}" msgtxt1) &&
+ ref_adr=$(awk "/^References: /{flag=1}/^MIME-Version: /{flag=0} flag {print}" \
+ msgtxt1) &&
+ echo "$to_adr" | grep author@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep to1@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep cc1@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep cc2@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep cc3@xxxxxxxxxxx &&
+ echo "$ref_adr" | grep "<firstauthor_654321@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep "<secondauthor_01546567@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep "<thirdauthor_1395838@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep "<author_123456@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep -v "References: <author_123456@xxxxxxxxxxx>"
+'
+
+test_expect_success $PREREQ 'Fields with --quote-email and --compose are correct' '
+ clean_fake_sendmail &&
+ git send-email \
+ --quote-email=email \
+ --compose \
+ --from="Example <nobody@xxxxxxxxxxx>" \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ -1 \
+ 2>errors &&
+ grep "From: Example <nobody@xxxxxxxxxxx>" msgtxt1 &&
+ grep "In-Reply-To: <author_123456@xxxxxxxxxxx>" msgtxt1 &&
+ grep "Subject: Re: subject goes here" msgtxt1 &&
+ to_adr=$(awk "/^To: /{flag=1}/^Cc: /{flag=0} flag {print}" msgtxt1) &&
+ cc_adr=$(awk "/^Cc: /{flag=1}/^Subject: /{flag=0} flag {print}" msgtxt1) &&
+ ref_adr=$(awk "/^References: /{flag=1}/^MIME-Version: /{flag=0} flag {print}" \
+ msgtxt1) &&
+ echo "$to_adr" | grep author@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep to1@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep cc1@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep cc2@xxxxxxxxxxx &&
+ echo "$cc_adr" | grep cc3@xxxxxxxxxxx &&
+ echo "$ref_adr" | grep "<firstauthor_654321@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep "<secondauthor_01546567@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep "<thirdauthor_1395838@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep "<author_123456@xxxxxxxxxxx>" &&
+ echo "$ref_adr" | grep -v "References: <author_123456@xxxxxxxxxxx>"
+'
+
+test_expect_success $PREREQ 'Re: written only once with --quote-email and --compose ' '
+ git send-email \
+ --quote-email=msgtxt1 \
+ --compose \
+ --from="Example <nobody@xxxxxxxxxxx>" \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ -1 \
+ 2>errors &&
+ grep "Subject: Re: subject goes here" msgtxt3
'
test_done
--
2.14.2
