]> git.99rst.org Git - git.git/commitdiff
t/t3437: fixup here-docs in the 'setup' test
authorCharvi Mendiratta <redacted>
Wed, 10 Feb 2021 11:36:45 +0000 (17:06 +0530)
committerJunio C Hamano <redacted>
Wed, 10 Feb 2021 21:58:19 +0000 (13:58 -0800)
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 <redacted>
Mentored-by: Phillip Wood <redacted>
Helped-by: Eric Sunshine <redacted>
Signed-off-by: Charvi Mendiratta <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t3437-rebase-fixup-options.sh

index 945df2555bced44f58885e667a15f2c4d7b10860..f599da3e08cb6653e4ddf89c2acba9ae388b11e8 100755 (executable)
@@ -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" &&
git clone https://git.99rst.org/PROJECT