Skip to content

Commit ee50af1

Browse files
gitstergitster
committed
Merge branch 'jp/maint-send-email-fold'
* jp/maint-send-email-fold: git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
2 parents 804edc1 + 02461e0 commit ee50af1

File tree

2 files changed

+78
-22
lines changed

2 files changed

+78
-22
lines changed

‎git-send-email.perl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ sub send_message
835835
$gitversion = Git::version();
836836
}
837837

838-
my $cc = join(", ", unique_email_list(@cc));
838+
my $cc = join(",\n\t", unique_email_list(@cc));
839839
my $ccline = "";
840840
if ($cc ne '') {
841841
$ccline = "\nCc: $cc";
@@ -976,7 +976,9 @@ sub send_message
976976
if ($smtp_server !~ m#^/#) {
977977
print "Server: $smtp_server\n";
978978
print "MAIL FROM:<$raw_from>\n";
979-
print "RCPT TO:".join(',',(map { "<$_>" } @recipients))."\n";
979+
foreach my $entry (@recipients) {
980+
print "RCPT TO:<$entry>\n";
981+
}
980982
} else {
981983
print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
982984
}

‎t/t9001-send-email.sh

Lines changed: 74 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,18 @@ cat >expected-show-all-headers <<\EOF
103103
Dry-OK. Log says:
104104
Server: relay.example.com
105105
MAIL FROM:<[email protected]>
106-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
106+
RCPT TO:<[email protected]>
107+
RCPT TO:<[email protected]>
108+
RCPT TO:<[email protected]>
109+
RCPT TO:<[email protected]>
110+
RCPT TO:<[email protected]>
111+
RCPT TO:<[email protected]>
107112
From: Example <[email protected]>
108113
To: [email protected]
109-
Cc: [email protected], A <[email protected]>, One <[email protected]>, [email protected]
114+
Cc: [email protected],
115+
A <[email protected]>,
116+
One <[email protected]>,
117+
[email protected]
110118
Subject: [PATCH 1/1] Second.
111119
Date: DATE-STRING
112120
Message-Id: MESSAGE-ID-STRING
@@ -164,7 +172,7 @@ test_expect_success 'cccmd works' '
164172
--smtp-server="$(pwd)/fake.sendmail" \
165173
cccmd.patch \
166174
&&
167-
grep ^Cc:.*[email protected] msgtxt1
175+
grep "^ [email protected]" msgtxt1
168176
'
169177

170178
z8=zzzzzzzz
@@ -278,10 +286,17 @@ cat >expected-suppress-sob <<\EOF
278286
Dry-OK. Log says:
279287
Server: relay.example.com
280288
MAIL FROM:<[email protected]>
281-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
289+
RCPT TO:<[email protected]>
290+
RCPT TO:<[email protected]>
291+
RCPT TO:<[email protected]>
292+
RCPT TO:<[email protected]>
293+
RCPT TO:<[email protected]>
282294
From: Example <[email protected]>
283295
To: [email protected]
284-
Cc: [email protected], A <[email protected]>, One <[email protected]>, [email protected]
296+
Cc: [email protected],
297+
A <[email protected]>,
298+
One <[email protected]>,
299+
[email protected]
285300
Subject: [PATCH 1/1] Second.
286301
Date: DATE-STRING
287302
Message-Id: MESSAGE-ID-STRING
@@ -318,10 +333,15 @@ cat >expected-suppress-sob <<\EOF
318333
Dry-OK. Log says:
319334
Server: relay.example.com
320335
MAIL FROM:<[email protected]>
321-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
336+
RCPT TO:<[email protected]>
337+
RCPT TO:<[email protected]>
338+
RCPT TO:<[email protected]>
339+
RCPT TO:<[email protected]>
322340
From: Example <[email protected]>
323341
To: [email protected]
324-
Cc: A <[email protected]>, One <[email protected]>, [email protected]
342+
Cc: A <[email protected]>,
343+
One <[email protected]>,
344+
[email protected]
325345
Subject: [PATCH 1/1] Second.
326346
Date: DATE-STRING
327347
Message-Id: MESSAGE-ID-STRING
@@ -344,10 +364,17 @@ cat >expected-suppress-cccmd <<\EOF
344364
Dry-OK. Log says:
345365
Server: relay.example.com
346366
MAIL FROM:<[email protected]>
347-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
367+
RCPT TO:<[email protected]>
368+
RCPT TO:<[email protected]>
369+
RCPT TO:<[email protected]>
370+
RCPT TO:<[email protected]>
371+
RCPT TO:<[email protected]>
348372
From: Example <[email protected]>
349373
To: [email protected]
350-
Cc: A <[email protected]>, One <[email protected]>, [email protected], C O Mitter <[email protected]>
374+
Cc: A <[email protected]>,
375+
One <[email protected]>,
376+
[email protected],
377+
C O Mitter <[email protected]>
351378
Subject: [PATCH 1/1] Second.
352379
Date: DATE-STRING
353380
Message-Id: MESSAGE-ID-STRING
@@ -392,10 +419,17 @@ cat >expected-suppress-body <<\EOF
392419
Dry-OK. Log says:
393420
Server: relay.example.com
394421
MAIL FROM:<[email protected]>
395-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
422+
RCPT TO:<[email protected]>
423+
RCPT TO:<[email protected]>
424+
RCPT TO:<[email protected]>
425+
RCPT TO:<[email protected]>
426+
RCPT TO:<[email protected]>
396427
From: Example <[email protected]>
397428
To: [email protected]
398-
Cc: A <[email protected]>, One <[email protected]>, [email protected], [email protected]
429+
Cc: A <[email protected]>,
430+
One <[email protected]>,
431+
[email protected],
432+
[email protected]
399433
Subject: [PATCH 1/1] Second.
400434
Date: DATE-STRING
401435
Message-Id: MESSAGE-ID-STRING
@@ -416,10 +450,15 @@ cat >expected-suppress-body-cccmd <<\EOF
416450
Dry-OK. Log says:
417451
Server: relay.example.com
418452
MAIL FROM:<[email protected]>
419-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
453+
RCPT TO:<[email protected]>
454+
RCPT TO:<[email protected]>
455+
RCPT TO:<[email protected]>
456+
RCPT TO:<[email protected]>
420457
From: Example <[email protected]>
421458
To: [email protected]
422-
Cc: A <[email protected]>, One <[email protected]>, [email protected]
459+
Cc: A <[email protected]>,
460+
One <[email protected]>,
461+
[email protected]
423462
Subject: [PATCH 1/1] Second.
424463
Date: DATE-STRING
425464
Message-Id: MESSAGE-ID-STRING
@@ -440,10 +479,15 @@ cat >expected-suppress-sob <<\EOF
440479
Dry-OK. Log says:
441480
Server: relay.example.com
442481
MAIL FROM:<[email protected]>
443-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
482+
RCPT TO:<[email protected]>
483+
RCPT TO:<[email protected]>
484+
RCPT TO:<[email protected]>
485+
RCPT TO:<[email protected]>
444486
From: Example <[email protected]>
445487
To: [email protected]
446-
Cc: A <[email protected]>, One <[email protected]>, [email protected]
488+
Cc: A <[email protected]>,
489+
One <[email protected]>,
490+
[email protected]
447491
Subject: [PATCH 1/1] Second.
448492
Date: DATE-STRING
449493
Message-Id: MESSAGE-ID-STRING
@@ -466,10 +510,17 @@ cat >expected-suppress-bodycc <<\EOF
466510
Dry-OK. Log says:
467511
Server: relay.example.com
468512
MAIL FROM:<[email protected]>
469-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>,<[email protected]>
513+
RCPT TO:<[email protected]>
514+
RCPT TO:<[email protected]>
515+
RCPT TO:<[email protected]>
516+
RCPT TO:<[email protected]>
517+
RCPT TO:<[email protected]>
470518
From: Example <[email protected]>
471519
To: [email protected]
472-
Cc: A <[email protected]>, One <[email protected]>, [email protected], C O Mitter <[email protected]>
520+
Cc: A <[email protected]>,
521+
One <[email protected]>,
522+
[email protected],
523+
C O Mitter <[email protected]>
473524
Subject: [PATCH 1/1] Second.
474525
Date: DATE-STRING
475526
Message-Id: MESSAGE-ID-STRING
@@ -489,10 +540,13 @@ cat >expected-suppress-cc <<\EOF
489540
Dry-OK. Log says:
490541
Server: relay.example.com
491542
MAIL FROM:<[email protected]>
492-
RCPT TO:<[email protected]>,<[email protected]>,<[email protected]>
543+
RCPT TO:<[email protected]>
544+
RCPT TO:<[email protected]>
545+
RCPT TO:<[email protected]>
493546
From: Example <[email protected]>
494547
To: [email protected]
495-
Cc: A <[email protected]>, C O Mitter <[email protected]>
548+
Cc: A <[email protected]>,
549+
C O Mitter <[email protected]>
496550
Subject: [PATCH 1/1] Second.
497551
Date: DATE-STRING
498552
Message-Id: MESSAGE-ID-STRING
@@ -605,7 +659,7 @@ test_expect_success 'utf8 Cc is rfc2047 encoded' '
605659
[email protected] \
606660
--smtp-server="$(pwd)/fake.sendmail" \
607661
outdir/*.patch &&
608-
grep "^Cc:" msgtxt1 |
662+
grep "^ " msgtxt1 |
609663
grep "=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <[email protected]>"
610664
'
611665

0 commit comments

Comments
 (0)