Messages displayed by `send-email` should be shortened to avoid displaying
unnecessary information.
Signed-off-by: Samuel GROOT <samuel.groot@xxxxxxxxxxxxxxxx>
Signed-off-by: Tom RUSSELLO <tom.russello@xxxxxxxxxxxxxxxx>
Signed-off-by: Matthieu MOY <matthieu.moy@xxxxxxxxxxxxxxx>
---
git-send-email.perl | 22 +++++++++----------
t/t9001-send-email.sh | 58 +++++++++++++++++++++++++--------------------------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 6958785..9b51062 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1478,14 +1478,14 @@ foreach my $t (@files) {
$sauthor = sanitize_address($author);
next if $suppress_cc{'author'};
next if $suppress_cc{'self'} and $sauthor eq $sender;
- printf("(mbox) Adding cc: %s from line '%s'\n",
- $1, $_) unless $quiet;
+ printf("Adding cc: %s from From: header\n",
+ $1) unless $quiet;
push @cc, $1;
}
elsif (/^To:\s+(.*)$/i) {
foreach my $addr (parse_address_line($1)) {
- printf("(mbox) Adding to: %s from line '%s'\n",
- $addr, $_) unless $quiet;
+ printf("Adding to: %s from To: header\n",
+ $addr) unless $quiet;
push @to, $addr;
}
}
@@ -1498,8 +1498,8 @@ foreach my $t (@files) {
} else {
next if ($suppress_cc{'cc'});
}
- printf("(mbox) Adding cc: %s from line '%s'\n",
- $addr, $_) unless $quiet;
+ printf("Adding cc: %s from Cc: header\n",
+ $addr) unless $quiet;
push @cc, $addr;
}
}
@@ -1532,8 +1532,8 @@ foreach my $t (@files) {
# So let's support that, too.
$input_format = 'lots';
if (@cc == 0 && !$suppress_cc{'cc'}) {
- printf("(non-mbox) Adding cc: %s from line '%s'\n",
- $_, $_) unless $quiet;
+ printf("Adding cc: %s from Cc: header\n",
+ $_) unless $quiet;
push @cc, $_;
} elsif (!defined $subject) {
$subject = $_;
@@ -1555,8 +1555,8 @@ foreach my $t (@files) {
next if $suppress_cc{'bodycc'} and $what =~ /Cc/i;
}
push @cc, $c;
- printf("(body) Adding cc: %s from line '%s'\n",
- $c, $_) unless $quiet;
+ printf("Adding cc: %s from Signed-off-by: trailer\n",
+ $c) unless $quiet;
}
}
close $fh;
@@ -1660,7 +1660,7 @@ sub recipients_cmd {
$address = sanitize_address($address);
next if ($address eq $sender and $suppress_cc{'self'});
push @addresses, $address;
- printf("($prefix) Adding %s: %s from: '%s'\n",
+ printf("Adding %s: %s from: '%s'\n",
$what, $address, $cmd) unless $quiet;
}
close $fh
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 943e6b7..aca7d5c 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -150,9 +150,9 @@ test_expect_success $PREREQ 'Verify commandline' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-show-all-headers <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -503,9 +503,9 @@ test_expect_success $PREREQ 'second message is patch' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-sob <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -555,9 +555,9 @@ test_expect_success $PREREQ 'sendemail.cc set' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-sob <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -587,10 +587,10 @@ test_expect_success $PREREQ 'sendemail.cc unset' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-cccmd <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(body) Adding cc: C O Mitter <committer@xxxxxxxxxxx> from line 'Signed-off-by: C O Mitter <committer@xxxxxxxxxxx>'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
+Adding cc: C O Mitter <committer@xxxxxxxxxxx> from Signed-off-by: trailer
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -647,10 +647,10 @@ test_expect_success $PREREQ '--suppress-cc=all' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-body <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(cc-cmd) Adding cc: cc-cmd@xxxxxxxxxxx from: './cccmd'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
+Adding cc: cc-cmd@xxxxxxxxxxx from: './cccmd'
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -681,9 +681,9 @@ test_expect_success $PREREQ '--suppress-cc=body' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-body-cccmd <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -712,9 +712,9 @@ test_expect_success $PREREQ '--suppress-cc=body --suppress-cc=cccmd' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-sob <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -744,10 +744,10 @@ test_expect_success $PREREQ '--suppress-cc=sob' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-bodycc <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(mbox) Adding cc: One <one@xxxxxxxxxxx> from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(mbox) Adding cc: two@xxxxxxxxxxx from line 'Cc: One <one@xxxxxxxxxxx>, two@xxxxxxxxxxx'
-(body) Adding cc: C O Mitter <committer@xxxxxxxxxxx> from line 'Signed-off-by: C O Mitter <committer@xxxxxxxxxxx>'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: One <one@xxxxxxxxxxx> from Cc: header
+Adding cc: two@xxxxxxxxxxx from Cc: header
+Adding cc: C O Mitter <committer@xxxxxxxxxxx> from Signed-off-by: trailer
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
@@ -778,8 +778,8 @@ test_expect_success $PREREQ '--suppress-cc=bodycc' '
test_expect_success $PREREQ 'setup expect' "
cat >expected-suppress-cc <<\EOF
0001-Second.patch
-(mbox) Adding cc: A <author@xxxxxxxxxxx> from line 'From: A <author@xxxxxxxxxxx>'
-(body) Adding cc: C O Mitter <committer@xxxxxxxxxxx> from line 'Signed-off-by: C O Mitter <committer@xxxxxxxxxxx>'
+Adding cc: A <author@xxxxxxxxxxx> from From: header
+Adding cc: C O Mitter <committer@xxxxxxxxxxx> from Signed-off-by: trailer
Dry-OK. Log says:
Server: relay.example.com
MAIL FROM:<from@xxxxxxxxxxx>
--
2.8.2.537.gb153d2a
--
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