t/t3437: fixup here-docs in the 'setup' test

The most common way to format here-docs in Git test scripts is for the
body and EOF to be indented the same amount as the command which opened
the here-doc. Fix a few here-docs in this script to conform to that
standard and also remove the unnecessary curly braces.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charvi Mendiratta
2021-02-10 17:06:45 +05:30
committed by Junio C Hamano
parent 75ace8329c
commit 17665167bb

View File

@ -38,13 +38,13 @@ get_author () {
test_expect_success 'setup' ' test_expect_success 'setup' '
cat >message <<-EOF && cat >message <<-EOF &&
amend! B amend! B
${EMPTY} $EMPTY
new subject new subject
${EMPTY} $EMPTY
new new
body body
EOF EOF
sed "1,2d" message >expected-message && sed "1,2d" message >expected-message &&
@ -70,38 +70,38 @@ test_expect_success 'setup' '
git commit --fixup=HEAD -a && git commit --fixup=HEAD -a &&
test_tick && test_tick &&
git commit --allow-empty -F - <<-EOF && git commit --allow-empty -F - <<-EOF &&
amend! B amend! B
${EMPTY} $EMPTY
B B
${EMPTY} $EMPTY
edited 1 edited 1
EOF EOF
test_tick && test_tick &&
git commit --allow-empty -F - <<-EOF && git commit --allow-empty -F - <<-EOF &&
amend! amend! B amend! amend! B
${EMPTY} $EMPTY
B B
${EMPTY} $EMPTY
edited 1 edited 1
${EMPTY} $EMPTY
edited 2 edited 2
EOF EOF
echo B2 >B && echo B2 >B &&
test_tick && test_tick &&
FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a && FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
echo B3 >B && echo B3 >B &&
test_tick && test_tick &&
git commit -a -F - <<-EOF && git commit -a -F - <<-EOF &&
amend! amend! amend! B amend! amend! amend! B
${EMPTY} $EMPTY
B B
${EMPTY} $EMPTY
edited 1 edited 1
${EMPTY} $EMPTY
edited 2 edited 2
${EMPTY} $EMPTY
edited 3 edited 3
EOF EOF
GIT_AUTHOR_NAME="Rebase Author" && GIT_AUTHOR_NAME="Rebase Author" &&
GIT_AUTHOR_EMAIL="rebase.author@example.com" && GIT_AUTHOR_EMAIL="rebase.author@example.com" &&