Always indent the continuation of a pipe, and do not indent the
continuation of a compound statement (involving a pipe). This better
reflects the precedence (and is thus potentially less misleading about
the actual structure of the compound command) and better follows most
existing precedents.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@xxxxxx>
---
There are also many cases of weirdly wrapped commands with the pipe in
the middle of the line; I did not touch these.
Cc: Junio C Hamano <gitster@xxxxxxxxx>
---
t/t9001-send-email.sh | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 48bf0af2ee..c459311a60 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -61,8 +61,8 @@ test_no_confirm () {
--smtp-server="$(pwd)/fake.sendmail" \
$@ \
$patches >stdout &&
- ! grep "Send this email" stdout &&
- >no_confirm_okay
+ ! grep "Send this email" stdout &&
+ >no_confirm_okay
}
# Exit immediately to prevent hang if a no-confirm test fails
@@ -342,8 +342,8 @@ test_expect_success $PREREQ 'Prompting works' '
--smtp-server="$(pwd)/fake.sendmail" \
$patches \
2>errors &&
- grep "^From: A U Thor <author@xxxxxxxxxxx>\$" msgtxt1 &&
- grep "^To: to@xxxxxxxxxxx\$" msgtxt1
+ grep "^From: A U Thor <author@xxxxxxxxxxx>\$" msgtxt1 &&
+ grep "^To: to@xxxxxxxxxxx\$" msgtxt1
'
test_expect_success $PREREQ,AUTOIDENT 'implicit ident is allowed' '
@@ -1197,7 +1197,7 @@ test_expect_success $PREREQ 'utf8 Cc is rfc2047 encoded' '
--smtp-server="$(pwd)/fake.sendmail" \
outdir/*.patch &&
grep "^ " msgtxt1 |
- grep "=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@xxxxxxxxxxx>"
+ grep "=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@xxxxxxxxxxx>"
'
test_expect_success $PREREQ '--compose adds MIME for utf8 body' '
@@ -1599,7 +1599,7 @@ test_expect_success $PREREQ 'setup expect' '
test_expect_success $PREREQ 'ASCII subject is not RFC2047 quoted' '
clean_fake_sendmail &&
echo bogus |
- git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
+ git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
--8bit-encoding=UTF-8 \
email-using-8bit >stdout &&
@@ -1618,7 +1618,7 @@ test_expect_success $PREREQ 'setup expect' '
test_expect_success $PREREQ 'asks about and fixes 8bit encodings' '
clean_fake_sendmail &&
echo |
- git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
+ git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit >stdout &&
grep "do not declare a Content-Transfer-Encoding" stdout &&
@@ -1632,7 +1632,7 @@ test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
clean_fake_sendmail &&
git config sendemail.assume8bitEncoding UTF-8 &&
echo bogus |
- git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
+ git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit >stdout &&
grep -E "Content|MIME" msgtxt1 >actual &&
@@ -1646,19 +1646,19 @@ test_expect_success $PREREQ 'sendemail.8bitEncoding in .git/config overrides --g
mkdir home &&
git config -f home/.gitconfig sendemail.assume8bitEncoding "bogus too" &&
echo bogus |
- env HOME="$(pwd)/home" DEBUG=1 \
- git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
+ env HOME="$(pwd)/home" DEBUG=1 \
+ git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit >stdout &&
grep -E "Content|MIME" msgtxt1 >actual &&
test_cmp content-type-decl actual
'
test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
clean_fake_sendmail &&
git config sendemail.assume8bitEncoding "bogus too" &&
echo bogus |
- git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
+ git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
--8bit-encoding=UTF-8 \
email-using-8bit >stdout &&
@@ -1687,7 +1687,7 @@ test_expect_success $PREREQ 'setup expect' '
test_expect_success $PREREQ '--8bit-encoding also treats subject' '
clean_fake_sendmail &&
echo bogus |
- git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
+ git send-email --from=author@xxxxxxxxxxx --to=nobody@xxxxxxxxxxx \
--smtp-server="$(pwd)/fake.sendmail" \
--8bit-encoding=UTF-8 \
email-using-8bit >stdout &&
--
2.40.0.152.g15d061e6df
