Skip to content

Commit 78b8d93

Browse files
charvi-077gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e166fe3 commit 78b8d93

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed

t/t7102-reset.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ test_expect_success 'test --mixed <paths>' '
439439
'
440440

441441
test_expect_success 'test resetting the index at give paths' '
442-
443442
mkdir sub &&
444443
>sub/file1 &&
445444
>sub/file2 &&
@@ -452,7 +451,6 @@ test_expect_success 'test resetting the index at give paths' '
452451
echo "$U" &&
453452
test_must_fail git diff-index --cached --exit-code "$T" &&
454453
test "$T" != "$U"
455-
456454
'
457455

458456
test_expect_success 'resetting an unmodified path is a no-op' '
@@ -490,7 +488,6 @@ test_expect_success 'resetting specific path that is unmerged' '
490488
'
491489

492490
test_expect_success 'disambiguation (1)' '
493-
494491
git reset --hard &&
495492
>secondfile &&
496493
git add secondfile &&
@@ -499,23 +496,19 @@ test_expect_success 'disambiguation (1)' '
499496
test -z "$(git diff --cached --name-only)" &&
500497
test -f secondfile &&
501498
test_must_be_empty secondfile
502-
503499
'
504500

505501
test_expect_success 'disambiguation (2)' '
506-
507502
git reset --hard &&
508503
>secondfile &&
509504
git add secondfile &&
510505
rm -f secondfile &&
511506
test_must_fail git reset secondfile &&
512507
test -n "$(git diff --cached --name-only -- secondfile)" &&
513508
test ! -f secondfile
514-
515509
'
516510

517511
test_expect_success 'disambiguation (3)' '
518-
519512
git reset --hard &&
520513
>secondfile &&
521514
git add secondfile &&
@@ -524,11 +517,9 @@ test_expect_success 'disambiguation (3)' '
524517
test_must_fail git diff --quiet &&
525518
test -z "$(git diff --cached --name-only)" &&
526519
test ! -f secondfile
527-
528520
'
529521

530522
test_expect_success 'disambiguation (4)' '
531-
532523
git reset --hard &&
533524
>secondfile &&
534525
git add secondfile &&

t/t7201-co.sh

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ fill () {
3333

3434

3535
test_expect_success setup '
36-
3736
fill x y z > same &&
3837
fill 1 2 3 4 5 6 7 8 >one &&
3938
fill a b c d e >two &&
@@ -63,7 +62,6 @@ test_expect_success setup '
6362
'
6463

6564
test_expect_success 'checkout from non-existing branch' '
66-
6765
git checkout -b delete-me master &&
6866
git update-ref -d --no-deref refs/heads/delete-me &&
6967
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
@@ -72,7 +70,6 @@ test_expect_success 'checkout from non-existing branch' '
7270
'
7371

7472
test_expect_success 'checkout with dirty tree without -m' '
75-
7673
fill 0 1 2 3 4 5 6 7 8 >one &&
7774
if git checkout side
7875
then
@@ -81,11 +78,9 @@ test_expect_success 'checkout with dirty tree without -m' '
8178
else
8279
echo "happy - failed correctly"
8380
fi
84-
8581
'
8682

8783
test_expect_success 'checkout with unrelated dirty tree without -m' '
88-
8984
git checkout -f master &&
9085
fill 0 1 2 3 4 5 6 7 8 >same &&
9186
cp same kept &&
@@ -96,7 +91,6 @@ test_expect_success 'checkout with unrelated dirty tree without -m' '
9691
'
9792

9893
test_expect_success 'checkout -m with dirty tree' '
99-
10094
git checkout -f master &&
10195
git clean -f &&
10296
@@ -121,7 +115,6 @@ test_expect_success 'checkout -m with dirty tree' '
121115
'
122116

123117
test_expect_success 'checkout -m with dirty tree, renamed' '
124-
125118
git checkout -f master && git clean -f &&
126119
127120
fill 1 2 3 4 5 7 8 >one &&
@@ -139,11 +132,9 @@ test_expect_success 'checkout -m with dirty tree, renamed' '
139132
! test -f one &&
140133
git diff --cached >current &&
141134
test_must_be_empty current
142-
143135
'
144136

145137
test_expect_success 'checkout -m with merge conflict' '
146-
147138
git checkout -f master && git clean -f &&
148139
149140
fill 1 T 3 4 5 6 S 8 >one &&
@@ -166,7 +157,6 @@ test_expect_success 'checkout -m with merge conflict' '
166157
'
167158

168159
test_expect_success 'format of merge conflict from checkout -m' '
169-
170160
git checkout -f master && git clean -f &&
171161
172162
fill b d > two &&
@@ -190,7 +180,6 @@ test_expect_success 'format of merge conflict from checkout -m' '
190180
'
191181

192182
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
193-
194183
git checkout -f master && git reset --hard && git clean -f &&
195184
196185
fill b d > two &&
@@ -216,7 +205,6 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
216205
'
217206

218207
test_expect_success 'switch to another branch while carrying a deletion' '
219-
220208
git checkout -f master && git reset --hard && git clean -f &&
221209
git rm two &&
222210
@@ -228,7 +216,6 @@ test_expect_success 'switch to another branch while carrying a deletion' '
228216
'
229217

230218
test_expect_success 'checkout to detach HEAD (with advice declined)' '
231-
232219
git config advice.detachedHead false &&
233220
rev=$(git rev-parse --short renamer^) &&
234221
git checkout -f renamer && git clean -f &&
@@ -267,7 +254,6 @@ test_expect_success 'checkout to detach HEAD' '
267254
'
268255

269256
test_expect_success 'checkout to detach HEAD with branchname^' '
270-
271257
git checkout -f master && git clean -f &&
272258
git checkout renamer^ &&
273259
H=$(git rev-parse --verify HEAD) &&
@@ -283,7 +269,6 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
283269
'
284270

285271
test_expect_success 'checkout to detach HEAD with :/message' '
286-
287272
git checkout -f master && git clean -f &&
288273
git checkout ":/Initial" &&
289274
H=$(git rev-parse --verify HEAD) &&
@@ -299,7 +284,6 @@ test_expect_success 'checkout to detach HEAD with :/message' '
299284
'
300285

301286
test_expect_success 'checkout to detach HEAD with HEAD^0' '
302-
303287
git checkout -f master && git clean -f &&
304288
git checkout HEAD^0 &&
305289
H=$(git rev-parse --verify HEAD) &&
@@ -315,7 +299,6 @@ test_expect_success 'checkout to detach HEAD with HEAD^0' '
315299
'
316300

317301
test_expect_success 'checkout with ambiguous tag/branch names' '
318-
319302
git tag both side &&
320303
git branch both master &&
321304
git reset --hard &&
@@ -327,11 +310,9 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
327310
test "z$H" = "z$M" &&
328311
name=$(git symbolic-ref HEAD 2>/dev/null) &&
329312
test "z$name" = zrefs/heads/both
330-
331313
'
332314

333315
test_expect_success 'checkout with ambiguous tag/branch names' '
334-
335316
git reset --hard &&
336317
git checkout master &&
337318
@@ -351,11 +332,9 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
351332
else
352333
: happy
353334
fi
354-
355335
'
356336

357337
test_expect_success 'switch branches while in subdirectory' '
358-
359338
git reset --hard &&
360339
git checkout master &&
361340
@@ -366,11 +345,9 @@ test_expect_success 'switch branches while in subdirectory' '
366345
) &&
367346
! test -f subs/one &&
368347
rm -fr subs
369-
370348
'
371349

372350
test_expect_success 'checkout specific path while in subdirectory' '
373-
374351
git reset --hard &&
375352
git checkout side &&
376353
mkdir subs &&
@@ -385,7 +362,6 @@ test_expect_success 'checkout specific path while in subdirectory' '
385362
git checkout side -- bero
386363
) &&
387364
test -f subs/bero
388-
389365
'
390366

391367
test_expect_success 'checkout w/--track sets up tracking' '
@@ -608,7 +584,6 @@ test_expect_success 'failing checkout -b should not break working tree' '
608584
test $(git symbolic-ref HEAD) = refs/heads/master &&
609585
git diff --exit-code &&
610586
git diff --cached --exit-code
611-
612587
'
613588

614589
test_expect_success 'switch out of non-branch' '

0 commit comments

Comments
 (0)