Skip to content

Commit 1766516

Browse files
charvi-077gitster
authored andcommitted
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 <[email protected]> Mentored-by: Phillip Wood <[email protected]> Helped-by: Eric Sunshine <[email protected]> Signed-off-by: Charvi Mendiratta <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 75ace83 commit 1766516

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

t/t3437-rebase-fixup-options.sh

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ get_author () {
3838

3939
test_expect_success 'setup' '
4040
cat >message <<-EOF &&
41-
amend! B
42-
${EMPTY}
43-
new subject
44-
${EMPTY}
45-
new
46-
body
47-
EOF
41+
amend! B
42+
$EMPTY
43+
new subject
44+
$EMPTY
45+
new
46+
body
47+
EOF
4848
4949
sed "1,2d" message >expected-message &&
5050
@@ -70,38 +70,38 @@ test_expect_success 'setup' '
7070
git commit --fixup=HEAD -a &&
7171
test_tick &&
7272
git commit --allow-empty -F - <<-EOF &&
73-
amend! B
74-
${EMPTY}
75-
B
76-
${EMPTY}
77-
edited 1
78-
EOF
73+
amend! B
74+
$EMPTY
75+
B
76+
$EMPTY
77+
edited 1
78+
EOF
7979
test_tick &&
8080
git commit --allow-empty -F - <<-EOF &&
81-
amend! amend! B
82-
${EMPTY}
83-
B
84-
${EMPTY}
85-
edited 1
86-
${EMPTY}
87-
edited 2
88-
EOF
81+
amend! amend! B
82+
$EMPTY
83+
B
84+
$EMPTY
85+
edited 1
86+
$EMPTY
87+
edited 2
88+
EOF
8989
echo B2 >B &&
9090
test_tick &&
9191
FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
9292
echo B3 >B &&
9393
test_tick &&
9494
git commit -a -F - <<-EOF &&
95-
amend! amend! amend! B
96-
${EMPTY}
97-
B
98-
${EMPTY}
99-
edited 1
100-
${EMPTY}
101-
edited 2
102-
${EMPTY}
103-
edited 3
104-
EOF
95+
amend! amend! amend! B
96+
$EMPTY
97+
B
98+
$EMPTY
99+
edited 1
100+
$EMPTY
101+
edited 2
102+
$EMPTY
103+
edited 3
104+
EOF
105105
106106
GIT_AUTHOR_NAME="Rebase Author" &&
107107
GIT_AUTHOR_EMAIL="[email protected]" &&

0 commit comments

Comments
 (0)