[PATCH v3 05/11] t/t3437: fixup here-docs in the 'setup' test
From: Charvi Mendiratta <hidden>
Date: 2021-02-10 11:42:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 [off-list ref] Mentored-by: Phillip Wood [off-list ref] Helped-by: Eric Sunshine [off-list ref] Signed-off-by: Charvi Mendiratta <redacted> --- t/t3437-rebase-fixup-options.sh | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t3437-rebase-fixup-options.sh b/t/t3437-rebase-fixup-options.sh
index 945df2555b..f599da3e08 100755
--- a/t/t3437-rebase-fixup-options.sh
+++ b/t/t3437-rebase-fixup-options.sh@@ -38,13 +38,13 @@ get_author () { test_expect_success 'setup' ' cat >message <<-EOF && - amend! B - ${EMPTY} - new subject - ${EMPTY} - new - body - EOF + amend! B + $EMPTY + new subject + $EMPTY + new + body + EOF sed "1,2d" message >expected-message &&
@@ -70,38 +70,38 @@ test_expect_success 'setup' ' git commit --fixup=HEAD -a && test_tick && git commit --allow-empty -F - <<-EOF && - amend! B - ${EMPTY} - B - ${EMPTY} - edited 1 - EOF + amend! B + $EMPTY + B + $EMPTY + edited 1 + EOF test_tick && git commit --allow-empty -F - <<-EOF && - amend! amend! B - ${EMPTY} - B - ${EMPTY} - edited 1 - ${EMPTY} - edited 2 - EOF + amend! amend! B + $EMPTY + B + $EMPTY + edited 1 + $EMPTY + edited 2 + EOF echo B2 >B && test_tick && FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a && echo B3 >B && test_tick && git commit -a -F - <<-EOF && - amend! amend! amend! B - ${EMPTY} - B - ${EMPTY} - edited 1 - ${EMPTY} - edited 2 - ${EMPTY} - edited 3 - EOF + amend! amend! amend! B + $EMPTY + B + $EMPTY + edited 1 + $EMPTY + edited 2 + $EMPTY + edited 3 + EOF GIT_AUTHOR_NAME="Rebase Author" && GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
--
2.29.0.rc1