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>
Charvi Mendiratta committed
Feb 10, 2021 at 17:06 UTC
17665167bb548b7c46e207890edbec7feba054bb
1 file changed
+31
-31
t/t3437-rebase-fixup-options.sh
+31
-31
@@ -38,13 +38,13 @@ get_author () {
38
39
test_expect_success 'setup' '
40
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
48
49
sed "1,2d" message >expected-message &&
50
@@ -70,38 +70,38 @@ test_expect_success 'setup' '
70
git commit --fixup=HEAD -a &&
71
test_tick &&
72
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
79
test_tick &&
80
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
89
echo B2 >B &&
90
test_tick &&
91
FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
92
echo B3 >B &&
93
test_tick &&
94
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
105
106
GIT_AUTHOR_NAME="Rebase Author" &&
107
GIT_AUTHOR_EMAIL="rebase.author@example.com" &&