t7102,t7201: remove unnecessary blank spaces in test body
t7102 and t7201 still follow the old style of having blank lines around test body, which is not consistence with our current practice. Let's remove those unnecessary blank lines. Signed-off-by: Charvi Mendiratta <charvi077@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charvi Mendiratta committed
Oct 20, 2020 at 17:13 UTC
78b8d9340d175ac5b4924522cc5b1f5ae21aca94
2 files changed
-34
t/t7102-reset.sh
-9
@@ -439,7 +439,6 @@ test_expect_success 'test --mixed <paths>' '
439
'
440
441
test_expect_success 'test resetting the index at give paths' '
442
-
442
mkdir sub &&
443
>sub/file1 &&
444
>sub/file2 &&
@@ -452,7 +451,6 @@ test_expect_success 'test resetting the index at give paths' '
451
echo "$U" &&
452
test_must_fail git diff-index --cached --exit-code "$T" &&
453
test "$T" != "$U"
455
-
454
'
455
456
test_expect_success 'resetting an unmodified path is a no-op' '
@@ -490,7 +488,6 @@ test_expect_success 'resetting specific path that is unmerged' '
488
'
489
490
test_expect_success 'disambiguation (1)' '
493
-
491
git reset --hard &&
492
>secondfile &&
493
git add secondfile &&
@@ -499,11 +496,9 @@ test_expect_success 'disambiguation (1)' '
496
test -z "$(git diff --cached --name-only)" &&
497
test -f secondfile &&
498
test_must_be_empty secondfile
502
-
499
'
500
501
test_expect_success 'disambiguation (2)' '
506
-
502
git reset --hard &&
503
>secondfile &&
504
git add secondfile &&
@@ -511,11 +506,9 @@ test_expect_success 'disambiguation (2)' '
506
test_must_fail git reset secondfile &&
507
test -n "$(git diff --cached --name-only -- secondfile)" &&
508
test ! -f secondfile
514
-
509
'
510
511
test_expect_success 'disambiguation (3)' '
518
-
512
git reset --hard &&
513
>secondfile &&
514
git add secondfile &&
@@ -524,11 +517,9 @@ test_expect_success 'disambiguation (3)' '
517
test_must_fail git diff --quiet &&
518
test -z "$(git diff --cached --name-only)" &&
519
test ! -f secondfile
527
-
520
'
521
522
test_expect_success 'disambiguation (4)' '
531
-
523
git reset --hard &&
524
>secondfile &&
525
git add secondfile &&
t/t7201-co.sh
-25
@@ -33,7 +33,6 @@ fill () {
33
34
35
test_expect_success setup '
36
-
36
fill x y z > same &&
37
fill 1 2 3 4 5 6 7 8 >one &&
38
fill a b c d e >two &&
@@ -63,7 +62,6 @@ test_expect_success setup '
62
'
63
64
test_expect_success 'checkout from non-existing branch' '
66
-
65
git checkout -b delete-me master &&
66
git update-ref -d --no-deref refs/heads/delete-me &&
67
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
@@ -72,7 +70,6 @@ test_expect_success 'checkout from non-existing branch' '
70
'
71
72
test_expect_success 'checkout with dirty tree without -m' '
75
-
73
fill 0 1 2 3 4 5 6 7 8 >one &&
74
if git checkout side
75
then
@@ -81,11 +78,9 @@ test_expect_success 'checkout with dirty tree without -m' '
78
else
79
echo "happy - failed correctly"
80
fi
84
-
81
'
82
83
test_expect_success 'checkout with unrelated dirty tree without -m' '
88
-
84
git checkout -f master &&
85
fill 0 1 2 3 4 5 6 7 8 >same &&
86
cp same kept &&
@@ -96,7 +91,6 @@ test_expect_success 'checkout with unrelated dirty tree without -m' '
91
'
92
93
test_expect_success 'checkout -m with dirty tree' '
99
-
94
git checkout -f master &&
95
git clean -f &&
96
@@ -121,7 +115,6 @@ test_expect_success 'checkout -m with dirty tree' '
115
'
116
117
test_expect_success 'checkout -m with dirty tree, renamed' '
124
-
118
git checkout -f master && git clean -f &&
119
120
fill 1 2 3 4 5 7 8 >one &&
@@ -139,11 +132,9 @@ test_expect_success 'checkout -m with dirty tree, renamed' '
132
! test -f one &&
133
git diff --cached >current &&
134
test_must_be_empty current
142
-
135
'
136
137
test_expect_success 'checkout -m with merge conflict' '
146
-
138
git checkout -f master && git clean -f &&
139
140
fill 1 T 3 4 5 6 S 8 >one &&
@@ -166,7 +157,6 @@ test_expect_success 'checkout -m with merge conflict' '
157
'
158
159
test_expect_success 'format of merge conflict from checkout -m' '
169
-
160
git checkout -f master && git clean -f &&
161
162
fill b d > two &&
@@ -190,7 +180,6 @@ test_expect_success 'format of merge conflict from checkout -m' '
180
'
181
182
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
193
-
183
git checkout -f master && git reset --hard && git clean -f &&
184
185
fill b d > two &&
@@ -216,7 +205,6 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
205
'
206
207
test_expect_success 'switch to another branch while carrying a deletion' '
219
-
208
git checkout -f master && git reset --hard && git clean -f &&
209
git rm two &&
210
@@ -228,7 +216,6 @@ test_expect_success 'switch to another branch while carrying a deletion' '
216
'
217
218
test_expect_success 'checkout to detach HEAD (with advice declined)' '
231
-
219
git config advice.detachedHead false &&
220
rev=$(git rev-parse --short renamer^) &&
221
git checkout -f renamer && git clean -f &&
@@ -267,7 +254,6 @@ test_expect_success 'checkout to detach HEAD' '
254
'
255
256
test_expect_success 'checkout to detach HEAD with branchname^' '
270
-
257
git checkout -f master && git clean -f &&
258
git checkout renamer^ &&
259
H=$(git rev-parse --verify HEAD) &&
@@ -283,7 +269,6 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
269
'
270
271
test_expect_success 'checkout to detach HEAD with :/message' '
286
-
272
git checkout -f master && git clean -f &&
273
git checkout ":/Initial" &&
274
H=$(git rev-parse --verify HEAD) &&
@@ -299,7 +284,6 @@ test_expect_success 'checkout to detach HEAD with :/message' '
284
'
285
286
test_expect_success 'checkout to detach HEAD with HEAD^0' '
302
-
287
git checkout -f master && git clean -f &&
288
git checkout HEAD^0 &&
289
H=$(git rev-parse --verify HEAD) &&
@@ -315,7 +299,6 @@ test_expect_success 'checkout to detach HEAD with HEAD^0' '
299
'
300
301
test_expect_success 'checkout with ambiguous tag/branch names' '
318
-
302
git tag both side &&
303
git branch both master &&
304
git reset --hard &&
@@ -327,11 +310,9 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
310
test "z$H" = "z$M" &&
311
name=$(git symbolic-ref HEAD 2>/dev/null) &&
312
test "z$name" = zrefs/heads/both
330
-
313
'
314
315
test_expect_success 'checkout with ambiguous tag/branch names' '
334
-
316
git reset --hard &&
317
git checkout master &&
318
@@ -351,11 +332,9 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
332
else
333
: happy
334
fi
354
-
335
'
336
337
test_expect_success 'switch branches while in subdirectory' '
358
-
338
git reset --hard &&
339
git checkout master &&
340
@@ -366,11 +345,9 @@ test_expect_success 'switch branches while in subdirectory' '
345
) &&
346
! test -f subs/one &&
347
rm -fr subs
369
-
348
'
349
350
test_expect_success 'checkout specific path while in subdirectory' '
373
-
351
git reset --hard &&
352
git checkout side &&
353
mkdir subs &&
@@ -385,7 +362,6 @@ test_expect_success 'checkout specific path while in subdirectory' '
362
git checkout side -- bero
363
) &&
364
test -f subs/bero
388
-
365
'
366
367
test_expect_success 'checkout w/--track sets up tracking' '
@@ -608,7 +584,6 @@ test_expect_success 'failing checkout -b should not break working tree' '
584
test $(git symbolic-ref HEAD) = refs/heads/master &&
585
git diff --exit-code &&
586
git diff --cached --exit-code
611
-
587
'
588
589
test_expect_success 'switch out of non-branch' '