t4041 (diff-submodule-option): modernize style
- Enclose tests in single quotes as opposed to double quotes. This is the prevalent style in other tests. - Remove the unused variable $head4_full. - Indent the expected output so that it lines up with the rest of the test text. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Nov 30, 2012 at 17:07 UTC
a1549f9b85b4277115941160ba5e897f6784db26
1 file changed
+229
-230
t/t4041-diff-submodule-option.sh
+229
-230
@@ -35,41 +35,41 @@ add_file . foo >/dev/null
35
head1=$(add_file sm1 foo1 foo2)
36
fullhead1=$(cd sm1; git rev-parse --verify HEAD)
37
38
-test_expect_success 'added submodule' "
38
+test_expect_success 'added submodule' '
39
git add sm1 &&
40
git diff-index -p --submodule=log HEAD >actual &&
41
cat >expected <<-EOF &&
42
-Submodule sm1 0000000...$head1 (new submodule)
43
-EOF
42
+ Submodule sm1 0000000...$head1 (new submodule)
43
+ EOF
44
test_cmp expected actual
45
-"
45
+'
46
47
-test_expect_success 'added submodule, set diff.submodule' "
47
+test_expect_success 'added submodule, set diff.submodule' '
48
git config diff.submodule log &&
49
git add sm1 &&
50
git diff --cached >actual &&
51
cat >expected <<-EOF &&
52
-Submodule sm1 0000000...$head1 (new submodule)
53
-EOF
52
+ Submodule sm1 0000000...$head1 (new submodule)
53
+ EOF
54
git config --unset diff.submodule &&
55
test_cmp expected actual
56
-"
56
+'
57
58
-test_expect_success '--submodule=short overrides diff.submodule' "
58
+test_expect_success '--submodule=short overrides diff.submodule' '
59
test_config diff.submodule log &&
60
git add sm1 &&
61
git diff --submodule=short --cached >actual &&
62
cat >expected <<-EOF &&
63
-diff --git a/sm1 b/sm1
64
-new file mode 160000
65
-index 0000000..$head1
66
---- /dev/null
67
-+++ b/sm1
68
-@@ -0,0 +1 @@
69
-+Subproject commit $fullhead1
70
-EOF
63
+ diff --git a/sm1 b/sm1
64
+ new file mode 160000
65
+ index 0000000..$head1
66
+ --- /dev/null
67
+ +++ b/sm1
68
+ @@ -0,0 +1 @@
69
+ +Subproject commit $fullhead1
70
+ EOF
71
test_cmp expected actual
72
-"
72
+'
73
74
test_expect_success 'diff.submodule does not affect plumbing' '
75
test_config diff.submodule log &&
@@ -89,47 +89,47 @@ test_expect_success 'diff.submodule does not affect plumbing' '
89
commit_file sm1 &&
90
head2=$(add_file sm1 foo3)
91
92
-test_expect_success 'modified submodule(forward)' "
92
+test_expect_success 'modified submodule(forward)' '
93
git diff-index -p --submodule=log HEAD >actual &&
94
cat >expected <<-EOF &&
95
-Submodule sm1 $head1..$head2:
96
- > Add foo3
97
-EOF
95
+ Submodule sm1 $head1..$head2:
96
+ > Add foo3
97
+ EOF
98
test_cmp expected actual
99
-"
99
+'
100
101
-test_expect_success 'modified submodule(forward)' "
101
+test_expect_success 'modified submodule(forward)' '
102
git diff --submodule=log >actual &&
103
cat >expected <<-EOF &&
104
-Submodule sm1 $head1..$head2:
105
- > Add foo3
106
-EOF
104
+ Submodule sm1 $head1..$head2:
105
+ > Add foo3
106
+ EOF
107
test_cmp expected actual
108
-"
108
+'
109
110
-test_expect_success 'modified submodule(forward) --submodule' "
110
+test_expect_success 'modified submodule(forward) --submodule' '
111
git diff --submodule >actual &&
112
cat >expected <<-EOF &&
113
-Submodule sm1 $head1..$head2:
114
- > Add foo3
115
-EOF
113
+ Submodule sm1 $head1..$head2:
114
+ > Add foo3
115
+ EOF
116
test_cmp expected actual
117
-"
117
+'
118
119
-test_expect_success 'modified submodule(forward) --submodule=short' "
119
fullhead2=$(cd sm1; git rev-parse --verify HEAD)
120
+test_expect_success 'modified submodule(forward) --submodule=short' '
121
git diff --submodule=short >actual &&
122
cat >expected <<-EOF &&
123
-diff --git a/sm1 b/sm1
124
-index $head1..$head2 160000
125
---- a/sm1
126
-+++ b/sm1
127
-@@ -1 +1 @@
128
--Subproject commit $fullhead1
129
-+Subproject commit $fullhead2
130
-EOF
123
+ diff --git a/sm1 b/sm1
124
+ index $head1..$head2 160000
125
+ --- a/sm1
126
+ +++ b/sm1
127
+ @@ -1 +1 @@
128
+ -Subproject commit $fullhead1
129
+ +Subproject commit $fullhead2
130
+ EOF
131
test_cmp expected actual
132
-"
132
+'
133
134
commit_file sm1 &&
135
head3=$(
@@ -138,29 +138,28 @@ head3=$(
138
git rev-parse --short --verify HEAD
139
)
140
141
-test_expect_success 'modified submodule(backward)' "
141
+test_expect_success 'modified submodule(backward)' '
142
git diff-index -p --submodule=log HEAD >actual &&
143
cat >expected <<-EOF &&
144
-Submodule sm1 $head2..$head3 (rewind):
145
- < Add foo3
146
- < Add foo2
147
-EOF
144
+ Submodule sm1 $head2..$head3 (rewind):
145
+ < Add foo3
146
+ < Add foo2
147
+ EOF
148
test_cmp expected actual
149
-"
149
+'
150
151
-head4=$(add_file sm1 foo4 foo5) &&
152
-head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD)
153
-test_expect_success 'modified submodule(backward and forward)' "
151
+head4=$(add_file sm1 foo4 foo5)
152
+test_expect_success 'modified submodule(backward and forward)' '
153
git diff-index -p --submodule=log HEAD >actual &&
154
cat >expected <<-EOF &&
156
-Submodule sm1 $head2...$head4:
157
- > Add foo5
158
- > Add foo4
159
- < Add foo3
160
- < Add foo2
161
-EOF
155
+ Submodule sm1 $head2...$head4:
156
+ > Add foo5
157
+ > Add foo4
158
+ < Add foo3
159
+ < Add foo2
160
+ EOF
161
test_cmp expected actual
163
-"
162
+'
163
164
commit_file sm1 &&
165
mv sm1 sm1-bak &&
@@ -170,319 +169,319 @@ git add sm1 &&
169
rm -f sm1 &&
170
mv sm1-bak sm1
171
173
-test_expect_success 'typechanged submodule(submodule->blob), --cached' "
172
+test_expect_success 'typechanged submodule(submodule->blob), --cached' '
173
git diff --submodule=log --cached >actual &&
174
cat >expected <<-EOF &&
176
-Submodule sm1 $head4...0000000 (submodule deleted)
177
-diff --git a/sm1 b/sm1
178
-new file mode 100644
179
-index 0000000..$head5
180
---- /dev/null
181
-+++ b/sm1
182
-@@ -0,0 +1 @@
183
-+sm1
184
-EOF
175
+ Submodule sm1 $head4...0000000 (submodule deleted)
176
+ diff --git a/sm1 b/sm1
177
+ new file mode 100644
178
+ index 0000000..$head5
179
+ --- /dev/null
180
+ +++ b/sm1
181
+ @@ -0,0 +1 @@
182
+ +sm1
183
+ EOF
184
test_cmp expected actual
186
-"
185
+'
186
188
-test_expect_success 'typechanged submodule(submodule->blob)' "
187
+test_expect_success 'typechanged submodule(submodule->blob)' '
188
git diff --submodule=log >actual &&
189
cat >expected <<-EOF &&
191
-diff --git a/sm1 b/sm1
192
-deleted file mode 100644
193
-index $head5..0000000
194
---- a/sm1
195
-+++ /dev/null
196
-@@ -1 +0,0 @@
197
--sm1
198
-Submodule sm1 0000000...$head4 (new submodule)
199
-EOF
190
+ diff --git a/sm1 b/sm1
191
+ deleted file mode 100644
192
+ index $head5..0000000
193
+ --- a/sm1
194
+ +++ /dev/null
195
+ @@ -1 +0,0 @@
196
+ -sm1
197
+ Submodule sm1 0000000...$head4 (new submodule)
198
+ EOF
199
test_cmp expected actual
201
-"
200
+'
201
202
rm -rf sm1 &&
203
git checkout-index sm1
205
-test_expect_success 'typechanged submodule(submodule->blob)' "
204
+test_expect_success 'typechanged submodule(submodule->blob)' '
205
git diff-index -p --submodule=log HEAD >actual &&
206
cat >expected <<-EOF &&
208
-Submodule sm1 $head4...0000000 (submodule deleted)
209
-diff --git a/sm1 b/sm1
210
-new file mode 100644
211
-index 0000000..$head5
212
---- /dev/null
213
-+++ b/sm1
214
-@@ -0,0 +1 @@
215
-+sm1
216
-EOF
207
+ Submodule sm1 $head4...0000000 (submodule deleted)
208
+ diff --git a/sm1 b/sm1
209
+ new file mode 100644
210
+ index 0000000..$head5
211
+ --- /dev/null
212
+ +++ b/sm1
213
+ @@ -0,0 +1 @@
214
+ +sm1
215
+ EOF
216
test_cmp expected actual
218
-"
217
+'
218
219
rm -f sm1 &&
220
test_create_repo sm1 &&
221
head6=$(add_file sm1 foo6 foo7)
223
-test_expect_success 'nonexistent commit' "
222
fullhead6=$(cd sm1; git rev-parse --verify HEAD)
223
+test_expect_success 'nonexistent commit' '
224
git diff-index -p --submodule=log HEAD >actual &&
225
cat >expected <<-EOF &&
227
-Submodule sm1 $head4...$head6 (commits not present)
228
-EOF
226
+ Submodule sm1 $head4...$head6 (commits not present)
227
+ EOF
228
test_cmp expected actual
230
-"
229
+'
230
231
commit_file
233
-test_expect_success 'typechanged submodule(blob->submodule)' "
232
+test_expect_success 'typechanged submodule(blob->submodule)' '
233
git diff-index -p --submodule=log HEAD >actual &&
234
cat >expected <<-EOF &&
236
-diff --git a/sm1 b/sm1
237
-deleted file mode 100644
238
-index $head5..0000000
239
---- a/sm1
240
-+++ /dev/null
241
-@@ -1 +0,0 @@
242
--sm1
243
-Submodule sm1 0000000...$head6 (new submodule)
244
-EOF
235
+ diff --git a/sm1 b/sm1
236
+ deleted file mode 100644
237
+ index $head5..0000000
238
+ --- a/sm1
239
+ +++ /dev/null
240
+ @@ -1 +0,0 @@
241
+ -sm1
242
+ Submodule sm1 0000000...$head6 (new submodule)
243
+ EOF
244
test_cmp expected actual
246
-"
245
+'
246
247
commit_file sm1 &&
249
-test_expect_success 'submodule is up to date' "
248
+test_expect_success 'submodule is up to date' '
249
git diff-index -p --submodule=log HEAD >actual &&
250
cat >expected <<-EOF &&
252
-EOF
251
+ EOF
252
test_cmp expected actual
254
-"
253
+'
254
256
-test_expect_success 'submodule contains untracked content' "
255
+test_expect_success 'submodule contains untracked content' '
256
echo new > sm1/new-file &&
257
git diff-index -p --submodule=log HEAD >actual &&
258
cat >expected <<-EOF &&
260
-Submodule sm1 contains untracked content
261
-EOF
259
+ Submodule sm1 contains untracked content
260
+ EOF
261
test_cmp expected actual
263
-"
262
+'
263
265
-test_expect_success 'submodule contains untracked content (untracked ignored)' "
264
+test_expect_success 'submodule contains untracked content (untracked ignored)' '
265
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
266
! test -s actual
268
-"
267
+'
268
270
-test_expect_success 'submodule contains untracked content (dirty ignored)' "
269
+test_expect_success 'submodule contains untracked content (dirty ignored)' '
270
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
271
! test -s actual
273
-"
272
+'
273
275
-test_expect_success 'submodule contains untracked content (all ignored)' "
274
+test_expect_success 'submodule contains untracked content (all ignored)' '
275
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
276
! test -s actual
278
-"
277
+'
278
280
-test_expect_success 'submodule contains untracked and modifed content' "
279
+test_expect_success 'submodule contains untracked and modifed content' '
280
echo new > sm1/foo6 &&
281
git diff-index -p --submodule=log HEAD >actual &&
282
cat >expected <<-EOF &&
284
-Submodule sm1 contains untracked content
285
-Submodule sm1 contains modified content
286
-EOF
283
+ Submodule sm1 contains untracked content
284
+ Submodule sm1 contains modified content
285
+ EOF
286
test_cmp expected actual
288
-"
287
+'
288
290
-test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' "
289
+test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' '
290
echo new > sm1/foo6 &&
291
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
292
cat >expected <<-EOF &&
294
-Submodule sm1 contains modified content
295
-EOF
293
+ Submodule sm1 contains modified content
294
+ EOF
295
test_cmp expected actual
297
-"
296
+'
297
299
-test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' "
298
+test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' '
299
echo new > sm1/foo6 &&
300
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
301
! test -s actual
303
-"
302
+'
303
305
-test_expect_success 'submodule contains untracked and modifed content (all ignored)' "
304
+test_expect_success 'submodule contains untracked and modifed content (all ignored)' '
305
echo new > sm1/foo6 &&
306
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
307
! test -s actual
309
-"
308
+'
309
311
-test_expect_success 'submodule contains modifed content' "
310
+test_expect_success 'submodule contains modifed content' '
311
rm -f sm1/new-file &&
312
git diff-index -p --submodule=log HEAD >actual &&
313
cat >expected <<-EOF &&
315
-Submodule sm1 contains modified content
316
-EOF
314
+ Submodule sm1 contains modified content
315
+ EOF
316
test_cmp expected actual
318
-"
317
+'
318
319
(cd sm1; git commit -mchange foo6 >/dev/null) &&
321
-test_expect_success 'submodule is modified' "
320
head8=$(cd sm1; git rev-parse --short --verify HEAD) &&
321
+test_expect_success 'submodule is modified' '
322
git diff-index -p --submodule=log HEAD >actual &&
323
cat >expected <<-EOF &&
325
-Submodule sm1 $head6..$head8:
326
- > change
327
-EOF
324
+ Submodule sm1 $head6..$head8:
325
+ > change
326
+ EOF
327
test_cmp expected actual
329
-"
328
+'
329
331
-test_expect_success 'modified submodule contains untracked content' "
330
+test_expect_success 'modified submodule contains untracked content' '
331
echo new > sm1/new-file &&
332
git diff-index -p --submodule=log HEAD >actual &&
333
cat >expected <<-EOF &&
335
-Submodule sm1 contains untracked content
336
-Submodule sm1 $head6..$head8:
337
- > change
338
-EOF
334
+ Submodule sm1 contains untracked content
335
+ Submodule sm1 $head6..$head8:
336
+ > change
337
+ EOF
338
test_cmp expected actual
340
-"
339
+'
340
342
-test_expect_success 'modified submodule contains untracked content (untracked ignored)' "
341
+test_expect_success 'modified submodule contains untracked content (untracked ignored)' '
342
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
343
cat >expected <<-EOF &&
345
-Submodule sm1 $head6..$head8:
346
- > change
347
-EOF
344
+ Submodule sm1 $head6..$head8:
345
+ > change
346
+ EOF
347
test_cmp expected actual
349
-"
348
+'
349
351
-test_expect_success 'modified submodule contains untracked content (dirty ignored)' "
350
+test_expect_success 'modified submodule contains untracked content (dirty ignored)' '
351
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
352
cat >expected <<-EOF &&
354
-Submodule sm1 $head6..$head8:
355
- > change
356
-EOF
353
+ Submodule sm1 $head6..$head8:
354
+ > change
355
+ EOF
356
test_cmp expected actual
358
-"
357
+'
358
360
-test_expect_success 'modified submodule contains untracked content (all ignored)' "
359
+test_expect_success 'modified submodule contains untracked content (all ignored)' '
360
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
361
! test -s actual
363
-"
362
+'
363
365
-test_expect_success 'modified submodule contains untracked and modifed content' "
364
+test_expect_success 'modified submodule contains untracked and modifed content' '
365
echo modification >> sm1/foo6 &&
366
git diff-index -p --submodule=log HEAD >actual &&
367
cat >expected <<-EOF &&
369
-Submodule sm1 contains untracked content
370
-Submodule sm1 contains modified content
371
-Submodule sm1 $head6..$head8:
372
- > change
373
-EOF
368
+ Submodule sm1 contains untracked content
369
+ Submodule sm1 contains modified content
370
+ Submodule sm1 $head6..$head8:
371
+ > change
372
+ EOF
373
test_cmp expected actual
375
-"
374
+'
375
377
-test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' "
376
+test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' '
377
echo modification >> sm1/foo6 &&
378
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
379
cat >expected <<-EOF &&
381
-Submodule sm1 contains modified content
382
-Submodule sm1 $head6..$head8:
383
- > change
384
-EOF
380
+ Submodule sm1 contains modified content
381
+ Submodule sm1 $head6..$head8:
382
+ > change
383
+ EOF
384
test_cmp expected actual
386
-"
385
+'
386
388
-test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' "
387
+test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' '
388
echo modification >> sm1/foo6 &&
389
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
390
cat >expected <<-EOF &&
392
-Submodule sm1 $head6..$head8:
393
- > change
394
-EOF
391
+ Submodule sm1 $head6..$head8:
392
+ > change
393
+ EOF
394
test_cmp expected actual
396
-"
395
+'
396
398
-test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' "
397
+test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' '
398
echo modification >> sm1/foo6 &&
399
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
400
! test -s actual
402
-"
401
+'
402
404
-test_expect_success 'modified submodule contains modifed content' "
403
+test_expect_success 'modified submodule contains modifed content' '
404
rm -f sm1/new-file &&
405
git diff-index -p --submodule=log HEAD >actual &&
406
cat >expected <<-EOF &&
408
-Submodule sm1 contains modified content
409
-Submodule sm1 $head6..$head8:
410
- > change
411
-EOF
407
+ Submodule sm1 contains modified content
408
+ Submodule sm1 $head6..$head8:
409
+ > change
410
+ EOF
411
test_cmp expected actual
413
-"
412
+'
413
414
rm -rf sm1
416
-test_expect_success 'deleted submodule' "
415
+test_expect_success 'deleted submodule' '
416
git diff-index -p --submodule=log HEAD >actual &&
417
cat >expected <<-EOF &&
419
-Submodule sm1 $head6...0000000 (submodule deleted)
420
-EOF
418
+ Submodule sm1 $head6...0000000 (submodule deleted)
419
+ EOF
420
test_cmp expected actual
422
-"
421
+'
422
423
test_create_repo sm2 &&
424
head7=$(add_file sm2 foo8 foo9) &&
425
git add sm2
426
428
-test_expect_success 'multiple submodules' "
427
+test_expect_success 'multiple submodules' '
428
git diff-index -p --submodule=log HEAD >actual &&
429
cat >expected <<-EOF &&
431
-Submodule sm1 $head6...0000000 (submodule deleted)
432
-Submodule sm2 0000000...$head7 (new submodule)
433
-EOF
430
+ Submodule sm1 $head6...0000000 (submodule deleted)
431
+ Submodule sm2 0000000...$head7 (new submodule)
432
+ EOF
433
test_cmp expected actual
435
-"
434
+'
435
437
-test_expect_success 'path filter' "
436
+test_expect_success 'path filter' '
437
git diff-index -p --submodule=log HEAD sm2 >actual &&
438
cat >expected <<-EOF &&
440
-Submodule sm2 0000000...$head7 (new submodule)
441
-EOF
439
+ Submodule sm2 0000000...$head7 (new submodule)
440
+ EOF
441
test_cmp expected actual
443
-"
442
+'
443
444
commit_file sm2
446
-test_expect_success 'given commit' "
445
+test_expect_success 'given commit' '
446
git diff-index -p --submodule=log HEAD^ >actual &&
447
cat >expected <<-EOF &&
449
-Submodule sm1 $head6...0000000 (submodule deleted)
450
-Submodule sm2 0000000...$head7 (new submodule)
451
-EOF
448
+ Submodule sm1 $head6...0000000 (submodule deleted)
449
+ Submodule sm2 0000000...$head7 (new submodule)
450
+ EOF
451
test_cmp expected actual
453
-"
452
+'
453
455
-test_expect_success 'given commit --submodule' "
454
+test_expect_success 'given commit --submodule' '
455
git diff-index -p --submodule HEAD^ >actual &&
456
cat >expected <<-EOF &&
458
-Submodule sm1 $head6...0000000 (submodule deleted)
459
-Submodule sm2 0000000...$head7 (new submodule)
460
-EOF
457
+ Submodule sm1 $head6...0000000 (submodule deleted)
458
+ Submodule sm2 0000000...$head7 (new submodule)
459
+ EOF
460
test_cmp expected actual
462
-"
461
+'
462
463
fullhead7=$(cd sm2; git rev-parse --verify HEAD)
464
466
-test_expect_success 'given commit --submodule=short' "
465
+test_expect_success 'given commit --submodule=short' '
466
git diff-index -p --submodule=short HEAD^ >actual &&
467
cat >expected <<-EOF &&
469
-diff --git a/sm1 b/sm1
470
-deleted file mode 160000
471
-index $head6..0000000
472
---- a/sm1
473
-+++ /dev/null
474
-@@ -1 +0,0 @@
475
--Subproject commit $fullhead6
476
-diff --git a/sm2 b/sm2
477
-new file mode 160000
478
-index 0000000..$head7
479
---- /dev/null
480
-+++ b/sm2
481
-@@ -0,0 +1 @@
482
-+Subproject commit $fullhead7
483
-EOF
484
- test_cmp expected actual
485
-"
468
+ diff --git a/sm1 b/sm1
469
+ deleted file mode 160000
470
+ index $head6..0000000
471
+ --- a/sm1
472
+ +++ /dev/null
473
+ @@ -1 +0,0 @@
474
+ -Subproject commit $fullhead6
475
+ diff --git a/sm2 b/sm2
476
+ new file mode 160000
477
+ index 0000000..$head7
478
+ --- /dev/null
479
+ +++ b/sm2
480
+ @@ -0,0 +1 @@
481
+ +Subproject commit $fullhead7
482
+ EOF
483
+ test_cmp expected actual
484
+'
485
486
test_expect_success 'setup .git file for sm2' '
487
(cd sm2 &&
@@ -494,9 +493,9 @@ test_expect_success 'setup .git file for sm2' '
493
test_expect_success 'diff --submodule with .git file' '
494
git diff --submodule HEAD^ >actual &&
495
cat >expected <<-EOF &&
497
-Submodule sm1 $head6...0000000 (submodule deleted)
498
-Submodule sm2 0000000...$head7 (new submodule)
499
-EOF
496
+ Submodule sm1 $head6...0000000 (submodule deleted)
497
+ Submodule sm2 0000000...$head7 (new submodule)
498
+ EOF
499
test_cmp expected actual
500
'
501