Skip to content

Commit 3a4fdee

Browse files
periperidipgitster
periperidip
authored and
gitster
committed
t7401: change indentation for enhanced readability
Change the indentation of expected outputs for enhanced readability of the tests. Also modify the heredoc string limiter in a test which lacks it to support the indentation change. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Taylor Blau <me@taylorr.com> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 17c102e commit 3a4fdee

File tree

1 file changed

+65
-65
lines changed

1 file changed

+65
-65
lines changed

‎t/t7401-submodule-summary.sh‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ test_expect_success 'added submodule' "
3838
git add sm1 &&
3939
git submodule summary >actual &&
4040
cat >expected <<-EOF &&
41-
* sm1 0000000...$head1 (2):
42-
> Add foo2
41+
* sm1 0000000...$head1 (2):
42+
> Add foo2
4343
44-
EOF
44+
EOF
4545
test_cmp expected actual
4646
"
4747

@@ -52,10 +52,10 @@ test_expect_success 'added submodule (subdirectory)' "
5252
git submodule summary >../actual
5353
) &&
5454
cat >expected <<-EOF &&
55-
* ../sm1 0000000...$head1 (2):
56-
> Add foo2
55+
* ../sm1 0000000...$head1 (2):
56+
> Add foo2
5757
58-
EOF
58+
EOF
5959
test_cmp expected actual
6060
"
6161

@@ -73,10 +73,10 @@ test_expect_success 'added submodule (subdirectory with explicit path)' "
7373
git submodule summary ../sm1 >../actual
7474
) &&
7575
cat >expected <<-EOF &&
76-
* ../sm1 0000000...$head1 (2):
77-
> Add foo2
76+
* ../sm1 0000000...$head1 (2):
77+
> Add foo2
7878
79-
EOF
79+
EOF
8080
test_cmp expected actual
8181
"
8282

@@ -86,20 +86,20 @@ head2=$(add_file sm1 foo3)
8686
test_expect_success 'modified submodule(forward)' "
8787
git submodule summary >actual &&
8888
cat >expected <<-EOF &&
89-
* sm1 $head1...$head2 (1):
90-
> Add foo3
89+
* sm1 $head1...$head2 (1):
90+
> Add foo3
9191
92-
EOF
92+
EOF
9393
test_cmp expected actual
9494
"
9595

9696
test_expect_success 'modified submodule(forward), --files' "
9797
git submodule summary --files >actual &&
9898
cat >expected <<-EOF &&
99-
* sm1 $head1...$head2 (1):
100-
> Add foo3
99+
* sm1 $head1...$head2 (1):
100+
> Add foo3
101101
102-
EOF
102+
EOF
103103
test_cmp expected actual
104104
"
105105

@@ -110,10 +110,10 @@ test_expect_success 'no ignore=all setting has any effect' "
110110
git config diff.ignoreSubmodules all &&
111111
git submodule summary >actual &&
112112
cat >expected <<-EOF &&
113-
* sm1 $head1...$head2 (1):
114-
> Add foo3
113+
* sm1 $head1...$head2 (1):
114+
> Add foo3
115115
116-
EOF
116+
EOF
117117
test_cmp expected actual &&
118118
git config --unset diff.ignoreSubmodules &&
119119
git config --remove-section submodule.sm1 &&
@@ -131,11 +131,11 @@ head3=$(
131131
test_expect_success 'modified submodule(backward)' "
132132
git submodule summary >actual &&
133133
cat >expected <<-EOF &&
134-
* sm1 $head2...$head3 (2):
135-
< Add foo3
136-
< Add foo2
134+
* sm1 $head2...$head3 (2):
135+
< Add foo3
136+
< Add foo2
137137
138-
EOF
138+
EOF
139139
test_cmp expected actual
140140
"
141141

@@ -144,25 +144,25 @@ head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD)
144144
test_expect_success 'modified submodule(backward and forward)' "
145145
git submodule summary >actual &&
146146
cat >expected <<-EOF &&
147-
* sm1 $head2...$head4 (4):
148-
> Add foo5
149-
> Add foo4
150-
< Add foo3
151-
< Add foo2
147+
* sm1 $head2...$head4 (4):
148+
> Add foo5
149+
> Add foo4
150+
< Add foo3
151+
< Add foo2
152152
153-
EOF
153+
EOF
154154
test_cmp expected actual
155155
"
156156

157157
test_expect_success '--summary-limit' "
158158
git submodule summary -n 3 >actual &&
159159
cat >expected <<-EOF &&
160-
* sm1 $head2...$head4 (4):
161-
> Add foo5
162-
> Add foo4
163-
< Add foo3
160+
* sm1 $head2...$head4 (4):
161+
> Add foo5
162+
> Add foo4
163+
< Add foo3
164164
165-
EOF
165+
EOF
166166
test_cmp expected actual
167167
"
168168

@@ -177,20 +177,20 @@ mv sm1-bak sm1
177177
test_expect_success 'typechanged submodule(submodule->blob), --cached' "
178178
git submodule summary --cached >actual &&
179179
cat >expected <<-EOF &&
180-
* sm1 $head4(submodule)->$head5(blob) (3):
181-
< Add foo5
180+
* sm1 $head4(submodule)->$head5(blob) (3):
181+
< Add foo5
182182
183-
EOF
183+
EOF
184184
test_i18ncmp expected actual
185185
"
186186

187187
test_expect_success 'typechanged submodule(submodule->blob), --files' "
188188
git submodule summary --files >actual &&
189189
cat >expected <<-EOF &&
190-
* sm1 $head5(blob)->$head4(submodule) (3):
191-
> Add foo5
190+
* sm1 $head5(blob)->$head4(submodule) (3):
191+
> Add foo5
192192
193-
EOF
193+
EOF
194194
test_i18ncmp expected actual
195195
"
196196

@@ -199,9 +199,9 @@ git checkout-index sm1
199199
test_expect_success 'typechanged submodule(submodule->blob)' "
200200
git submodule summary >actual &&
201201
cat >expected <<-EOF &&
202-
* sm1 $head4(submodule)->$head5(blob):
202+
* sm1 $head4(submodule)->$head5(blob):
203203
204-
EOF
204+
EOF
205205
test_i18ncmp expected actual
206206
"
207207

@@ -211,21 +211,21 @@ head6=$(add_file sm1 foo6 foo7)
211211
test_expect_success 'nonexistent commit' "
212212
git submodule summary >actual &&
213213
cat >expected <<-EOF &&
214-
* sm1 $head4...$head6:
215-
Warn: sm1 doesn't contain commit $head4_full
214+
* sm1 $head4...$head6:
215+
Warn: sm1 doesn't contain commit $head4_full
216216
217-
EOF
217+
EOF
218218
test_i18ncmp expected actual
219219
"
220220

221221
commit_file
222222
test_expect_success 'typechanged submodule(blob->submodule)' "
223223
git submodule summary >actual &&
224224
cat >expected <<-EOF &&
225-
* sm1 $head5(blob)->$head6(submodule) (2):
226-
> Add foo7
225+
* sm1 $head5(blob)->$head6(submodule) (2):
226+
> Add foo7
227227
228-
EOF
228+
EOF
229229
test_i18ncmp expected actual
230230
"
231231

@@ -234,9 +234,9 @@ rm -rf sm1
234234
test_expect_success 'deleted submodule' "
235235
git submodule summary >actual &&
236236
cat >expected <<-EOF &&
237-
* sm1 $head6...0000000:
237+
* sm1 $head6...0000000:
238238
239-
EOF
239+
EOF
240240
test_cmp expected actual
241241
"
242242

@@ -249,47 +249,47 @@ test_expect_success 'create second submodule' '
249249
test_expect_success 'multiple submodules' "
250250
git submodule summary >actual &&
251251
cat >expected <<-EOF &&
252-
* sm1 $head6...0000000:
252+
* sm1 $head6...0000000:
253253
254-
* sm2 0000000...$head7 (2):
255-
> Add foo9
254+
* sm2 0000000...$head7 (2):
255+
> Add foo9
256256
257-
EOF
257+
EOF
258258
test_cmp expected actual
259259
"
260260

261261
test_expect_success 'path filter' "
262262
git submodule summary sm2 >actual &&
263263
cat >expected <<-EOF &&
264-
* sm2 0000000...$head7 (2):
265-
> Add foo9
264+
* sm2 0000000...$head7 (2):
265+
> Add foo9
266266
267-
EOF
267+
EOF
268268
test_cmp expected actual
269269
"
270270

271271
commit_file sm2
272272
test_expect_success 'given commit' "
273273
git submodule summary HEAD^ >actual &&
274274
cat >expected <<-EOF &&
275-
* sm1 $head6...0000000:
275+
* sm1 $head6...0000000:
276276
277-
* sm2 0000000...$head7 (2):
278-
> Add foo9
277+
* sm2 0000000...$head7 (2):
278+
> Add foo9
279279
280-
EOF
280+
EOF
281281
test_cmp expected actual
282282
"
283283

284284
test_expect_success '--for-status' "
285285
git submodule summary --for-status HEAD^ >actual &&
286-
test_i18ncmp - actual <<EOF
287-
* sm1 $head6...0000000:
286+
test_i18ncmp - actual <<-EOF
287+
* sm1 $head6...0000000:
288288
289-
* sm2 0000000...$head7 (2):
290-
> Add foo9
289+
* sm2 0000000...$head7 (2):
290+
> Add foo9
291291
292-
EOF
292+
EOF
293293
"
294294

295295
test_expect_success 'fail when using --files together with --cached' "

0 commit comments

Comments
 (0)