send-email: remove cargo-culted multi-patch pattern in tests
Change test code added in f434c083a0 ("send-email: add --no-cc, --no-to, and --no-bcc", 2010-03-07) which blindly copied a pattern from an earlier test added in 32ae83194b ("add a test for git-send-email for non-threaded mails", 2009-06-12) where the "$patches" variable was supplied more than once. As it turns out we didn't need more than one "$patches" for the test added in 32ae83194b either. The only tests that actually needed this sort of invocation were the tests added in 54aae5e1a0 ("t9001: send-email interation with --in-reply-to and --chain-reply-to", 2010-10-19). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
May 17, 2019 at 21:55 UTC
2554dd1aa8ddbaa043cbd12da0ec7084a1413f37
1 file changed
+7
-7
t/t9001-send-email.sh
+7
-7
@@ -1176,7 +1176,7 @@ test_expect_success $PREREQ 'no in-reply-to and no threading' '
1176
--from="Example <nobody@example.com>" \
1177
--to=nobody@example.com \
1178
--no-thread \
1179
- $patches $patches >stdout &&
1179
+ $patches >stdout &&
1180
! grep "In-Reply-To: " stdout
1181
'
1182
@@ -1196,7 +1196,7 @@ test_expect_success $PREREQ 'sendemail.to works' '
1196
git send-email \
1197
--dry-run \
1198
--from="Example <nobody@example.com>" \
1199
- $patches $patches >stdout &&
1199
+ $patches >stdout &&
1200
grep "To: Somebody <somebody@ex.com>" stdout
1201
'
1202
@@ -1206,7 +1206,7 @@ test_expect_success $PREREQ '--no-to overrides sendemail.to' '
1206
--from="Example <nobody@example.com>" \
1207
--no-to \
1208
--to=nobody@example.com \
1209
- $patches $patches >stdout &&
1209
+ $patches >stdout &&
1210
grep "To: nobody@example.com" stdout &&
1211
! grep "To: Somebody <somebody@ex.com>" stdout
1212
'
@@ -1217,7 +1217,7 @@ test_expect_success $PREREQ 'sendemail.cc works' '
1217
--dry-run \
1218
--from="Example <nobody@example.com>" \
1219
--to=nobody@example.com \
1220
- $patches $patches >stdout &&
1220
+ $patches >stdout &&
1221
grep "Cc: Somebody <somebody@ex.com>" stdout
1222
'
1223
@@ -1228,7 +1228,7 @@ test_expect_success $PREREQ '--no-cc overrides sendemail.cc' '
1228
--no-cc \
1229
--cc=bodies@example.com \
1230
--to=nobody@example.com \
1231
- $patches $patches >stdout &&
1231
+ $patches >stdout &&
1232
grep "Cc: bodies@example.com" stdout &&
1233
! grep "Cc: Somebody <somebody@ex.com>" stdout
1234
'
@@ -1240,7 +1240,7 @@ test_expect_success $PREREQ 'sendemail.bcc works' '
1240
--from="Example <nobody@example.com>" \
1241
--to=nobody@example.com \
1242
--smtp-server relay.example.com \
1243
- $patches $patches >stdout &&
1243
+ $patches >stdout &&
1244
grep "RCPT TO:<other@ex.com>" stdout
1245
'
1246
@@ -1252,7 +1252,7 @@ test_expect_success $PREREQ '--no-bcc overrides sendemail.bcc' '
1252
--bcc=bodies@example.com \
1253
--to=nobody@example.com \
1254
--smtp-server relay.example.com \
1255
- $patches $patches >stdout &&
1255
+ $patches >stdout &&
1256
grep "RCPT TO:<bodies@example.com>" stdout &&
1257
! grep "RCPT TO:<other@ex.com>" stdout
1258
'