Skip to content

Commit 0720a51

Browse files
gitstergitster
committed
t9001: style modernisation phase #5
Two general shell script codingstyles around here-text. - Quote the <<\END_OF_HERE_TEXT string when there is no parameter substitution going on to reduce cognitive load of the reader. - Indent the text with <<-\END_OF_HERE_TEXT when able to make it easier to spot boundaries of the tests. Signed-off-by: Junio C Hamano <[email protected]>
1 parent ee756a8 commit 0720a51

File tree

1 file changed

+74
-76
lines changed

1 file changed

+74
-76
lines changed

‎t/t9001-send-email.sh

Lines changed: 74 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ test_expect_success $PREREQ 'Send patches' '
8888
'
8989

9090
test_expect_success $PREREQ 'setup expect' '
91-
cat >expected <<\EOF
92-
[email protected]!
93-
[email protected]!
94-
[email protected]!
95-
[email protected]!
96-
EOF
91+
cat >expected <<-\EOF
92+
[email protected]!
93+
[email protected]!
94+
[email protected]!
95+
[email protected]!
96+
EOF
9797
'
9898

9999
test_expect_success $PREREQ 'Verify commandline' '
@@ -106,14 +106,14 @@ test_expect_success $PREREQ 'Send patches with --envelope-sender' '
106106
'
107107

108108
test_expect_success $PREREQ 'setup expect' '
109-
cat >expected <<\EOF
110-
[email protected]!
111-
!-i!
112-
[email protected]!
113-
[email protected]!
114-
[email protected]!
115-
[email protected]!
116-
EOF
109+
cat >expected <<-\EOF
110+
[email protected]!
111+
!-i!
112+
[email protected]!
113+
[email protected]!
114+
[email protected]!
115+
[email protected]!
116+
EOF
117117
'
118118

119119
test_expect_success $PREREQ 'Verify commandline' '
@@ -126,14 +126,14 @@ test_expect_success $PREREQ 'Send patches with --envelope-sender=auto' '
126126
'
127127

128128
test_expect_success $PREREQ 'setup expect' '
129-
cat >expected <<\EOF
130-
[email protected]!
131-
!-i!
132-
[email protected]!
133-
[email protected]!
134-
[email protected]!
135-
[email protected]!
136-
EOF
129+
cat >expected <<-\EOF
130+
[email protected]!
131+
!-i!
132+
[email protected]!
133+
[email protected]!
134+
[email protected]!
135+
[email protected]!
136+
EOF
137137
'
138138

139139
test_expect_success $PREREQ 'Verify commandline' '
@@ -1192,7 +1192,7 @@ test_expect_success $PREREQ 'To headers from files reset each patch' '
11921192
'
11931193

11941194
test_expect_success $PREREQ 'setup expect' '
1195-
cat >email-using-8bit <<EOF
1195+
cat >email-using-8bit <<\EOF
11961196
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
11971197
Message-Id: <[email protected]>
11981198
From: [email protected]
@@ -1204,9 +1204,7 @@ EOF
12041204
'
12051205

12061206
test_expect_success $PREREQ 'setup expect' '
1207-
cat >expected <<EOF
1208-
Subject: subject goes here
1209-
EOF
1207+
echo "Subject: subject goes here" >expected
12101208
'
12111209

12121210
test_expect_success $PREREQ 'ASCII subject is not RFC2047 quoted' '
@@ -1221,11 +1219,11 @@ test_expect_success $PREREQ 'ASCII subject is not RFC2047 quoted' '
12211219
'
12221220

12231221
test_expect_success $PREREQ 'setup expect' '
1224-
cat >content-type-decl <<EOF
1225-
MIME-Version: 1.0
1226-
Content-Type: text/plain; charset=UTF-8
1227-
Content-Transfer-Encoding: 8bit
1228-
EOF
1222+
cat >content-type-decl <<-\EOF
1223+
MIME-Version: 1.0
1224+
Content-Type: text/plain; charset=UTF-8
1225+
Content-Transfer-Encoding: 8bit
1226+
EOF
12291227
'
12301228

12311229
test_expect_success $PREREQ 'asks about and fixes 8bit encodings' '
@@ -1265,21 +1263,21 @@ test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
12651263
'
12661264

12671265
test_expect_success $PREREQ 'setup expect' '
1268-
cat >email-using-8bit <<EOF
1269-
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
1270-
Message-Id: <[email protected]>
1271-
From: [email protected]
1272-
Date: Sat, 12 Jun 2010 15:53:58 +0200
1273-
Subject: Dieser Betreff enthält auch einen Umlaut!
1274-
1275-
Nothing to see here.
1276-
EOF
1266+
cat >email-using-8bit <<-\EOF
1267+
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
1268+
Message-Id: <[email protected]>
1269+
From: [email protected]
1270+
Date: Sat, 12 Jun 2010 15:53:58 +0200
1271+
Subject: Dieser Betreff enthält auch einen Umlaut!
1272+
1273+
Nothing to see here.
1274+
EOF
12771275
'
12781276

12791277
test_expect_success $PREREQ 'setup expect' '
1280-
cat >expected <<EOF
1281-
Subject: =?UTF-8?q?Dieser=20Betreff=20enth=C3=A4lt=20auch=20einen=20Umlaut!?=
1282-
EOF
1278+
cat >expected <<-\EOF
1279+
Subject: =?UTF-8?q?Dieser=20Betreff=20enth=C3=A4lt=20auch=20einen=20Umlaut!?=
1280+
EOF
12831281
'
12841282

12851283
test_expect_success $PREREQ '--8bit-encoding also treats subject' '
@@ -1294,16 +1292,16 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
12941292
'
12951293

12961294
test_expect_success $PREREQ 'setup expect' '
1297-
cat >email-using-8bit <<EOF
1298-
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
1299-
Message-Id: <[email protected]>
1300-
From: A U Thor <[email protected]>
1301-
Date: Sat, 12 Jun 2010 15:53:58 +0200
1302-
Content-Type: text/plain; charset=UTF-8
1303-
Subject: Nothing to see here.
1304-
1305-
Dieser Betreff enthält auch einen Umlaut!
1306-
EOF
1295+
cat >email-using-8bit <<-\EOF
1296+
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
1297+
Message-Id: <[email protected]>
1298+
From: A U Thor <[email protected]>
1299+
Date: Sat, 12 Jun 2010 15:53:58 +0200
1300+
Content-Type: text/plain; charset=UTF-8
1301+
Subject: Nothing to see here.
1302+
1303+
Dieser Betreff enthält auch einen Umlaut!
1304+
EOF
13071305
'
13081306

13091307
test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' '
@@ -1343,9 +1341,9 @@ test_expect_success $PREREQ 'sendemail.transferencoding=8bit' '
13431341
'
13441342

13451343
test_expect_success $PREREQ 'setup expect' '
1346-
cat >expected <<EOF
1347-
Dieser Betreff enth=C3=A4lt auch einen Umlaut!
1348-
EOF
1344+
cat >expected <<-\EOF
1345+
Dieser Betreff enth=C3=A4lt auch einen Umlaut!
1346+
EOF
13491347
'
13501348

13511349
test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printable' '
@@ -1360,9 +1358,9 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printab
13601358
'
13611359

13621360
test_expect_success $PREREQ 'setup expect' '
1363-
cat >expected <<EOF
1364-
RGllc2VyIEJldHJlZmYgZW50aMOkbHQgYXVjaCBlaW5lbiBVbWxhdXQhCg==
1365-
EOF
1361+
cat >expected <<-\EOF
1362+
RGllc2VyIEJldHJlZmYgZW50aMOkbHQgYXVjaCBlaW5lbiBVbWxhdXQhCg==
1363+
EOF
13661364
'
13671365

13681366
test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
@@ -1377,18 +1375,18 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
13771375
'
13781376

13791377
test_expect_success $PREREQ 'setup expect' '
1380-
cat >email-using-qp <<EOF
1381-
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
1382-
Message-Id: <[email protected]>
1383-
From: A U Thor <[email protected]>
1384-
Date: Sat, 12 Jun 2010 15:53:58 +0200
1385-
MIME-Version: 1.0
1386-
Content-Transfer-Encoding: quoted-printable
1387-
Content-Type: text/plain; charset=UTF-8
1388-
Subject: Nothing to see here.
1378+
cat >email-using-qp <<-\EOF
1379+
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
1380+
Message-Id: <[email protected]>
1381+
From: A U Thor <[email protected]>
1382+
Date: Sat, 12 Jun 2010 15:53:58 +0200
1383+
MIME-Version: 1.0
1384+
Content-Transfer-Encoding: quoted-printable
1385+
Content-Type: text/plain; charset=UTF-8
1386+
Subject: Nothing to see here.
13891387
1390-
Dieser Betreff enth=C3=A4lt auch einen Umlaut!
1391-
EOF
1388+
Dieser Betreff enth=C3=A4lt auch einen Umlaut!
1389+
EOF
13921390
'
13931391

13941392
test_expect_success $PREREQ 'convert from quoted-printable to base64' '
@@ -1416,9 +1414,9 @@ EOF
14161414
"
14171415

14181416
test_expect_success $PREREQ 'setup expect' '
1419-
cat >expected <<EOF
1420-
Look, I have a CRLF and an =3D sign!=0D
1421-
EOF
1417+
cat >expected <<-\EOF
1418+
Look, I have a CRLF and an =3D sign!=0D
1419+
EOF
14221420
'
14231421

14241422
test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printable' '
@@ -1433,9 +1431,9 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printabl
14331431
'
14341432

14351433
test_expect_success $PREREQ 'setup expect' '
1436-
cat >expected <<EOF
1437-
TG9vaywgSSBoYXZlIGEgQ1JMRiBhbmQgYW4gPSBzaWduIQ0K
1438-
EOF
1434+
cat >expected <<-\EOF
1435+
TG9vaywgSSBoYXZlIGEgQ1JMRiBhbmQgYW4gPSBzaWduIQ0K
1436+
EOF
14391437
'
14401438

14411439
test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' '

0 commit comments

Comments
 (0)