t7201-co: modernize test format
Some tests still use the old format with four spaces indentation. Standardize the tests to the new format with tab indentation. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Cai committed
May 20, 2023 at 16:13 UTC
10dae7853314598ec1a24ba8f6292ae730bace03
1 file changed
+46
-46
t/t7201-co.sh
+46
-46
@@ -372,75 +372,75 @@ test_expect_success 'checkout specific path while in subdirectory' '
372
'
373
374
test_expect_success 'checkout w/--track sets up tracking' '
375
- git config branch.autosetupmerge false &&
376
- git checkout main &&
377
- git checkout --track -b track1 &&
378
- test "$(git config branch.track1.remote)" &&
379
- test "$(git config branch.track1.merge)"
375
+ git config branch.autosetupmerge false &&
376
+ git checkout main &&
377
+ git checkout --track -b track1 &&
378
+ test "$(git config branch.track1.remote)" &&
379
+ test "$(git config branch.track1.merge)"
380
'
381
382
test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '
383
- test_when_finished git config branch.autosetupmerge false &&
384
- git config branch.autosetupmerge always &&
385
- git checkout main &&
386
- git checkout -b track2 &&
387
- test "$(git config branch.track2.remote)" &&
388
- test "$(git config branch.track2.merge)"
383
+ test_when_finished git config branch.autosetupmerge false &&
384
+ git config branch.autosetupmerge always &&
385
+ git checkout main &&
386
+ git checkout -b track2 &&
387
+ test "$(git config branch.track2.remote)" &&
388
+ test "$(git config branch.track2.merge)"
389
'
390
391
test_expect_success 'checkout w/--track from non-branch HEAD fails' '
392
- git checkout main^0 &&
393
- test_must_fail git symbolic-ref HEAD &&
394
- test_must_fail git checkout --track -b track &&
395
- test_must_fail git rev-parse --verify track &&
396
- test_must_fail git symbolic-ref HEAD &&
397
- test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
392
+ git checkout main^0 &&
393
+ test_must_fail git symbolic-ref HEAD &&
394
+ test_must_fail git checkout --track -b track &&
395
+ test_must_fail git rev-parse --verify track &&
396
+ test_must_fail git symbolic-ref HEAD &&
397
+ test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
398
'
399
400
test_expect_success 'checkout w/--track from tag fails' '
401
- git checkout main^0 &&
402
- test_must_fail git symbolic-ref HEAD &&
403
- test_must_fail git checkout --track -b track frotz &&
404
- test_must_fail git rev-parse --verify track &&
405
- test_must_fail git symbolic-ref HEAD &&
406
- test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
401
+ git checkout main^0 &&
402
+ test_must_fail git symbolic-ref HEAD &&
403
+ test_must_fail git checkout --track -b track frotz &&
404
+ test_must_fail git rev-parse --verify track &&
405
+ test_must_fail git symbolic-ref HEAD &&
406
+ test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
407
'
408
409
test_expect_success 'detach a symbolic link HEAD' '
410
- git checkout main &&
411
- git config --bool core.prefersymlinkrefs yes &&
412
- git checkout side &&
413
- git checkout main &&
414
- it=$(git symbolic-ref HEAD) &&
415
- test "z$it" = zrefs/heads/main &&
416
- here=$(git rev-parse --verify refs/heads/main) &&
417
- git checkout side^ &&
418
- test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
410
+ git checkout main &&
411
+ git config --bool core.prefersymlinkrefs yes &&
412
+ git checkout side &&
413
+ git checkout main &&
414
+ it=$(git symbolic-ref HEAD) &&
415
+ test "z$it" = zrefs/heads/main &&
416
+ here=$(git rev-parse --verify refs/heads/main) &&
417
+ git checkout side^ &&
418
+ test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
419
'
420
421
test_expect_success 'checkout with --track fakes a sensible -b <name>' '
422
- git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
423
- git update-ref refs/remotes/origin/koala/bear renamer &&
422
+ git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
423
+ git update-ref refs/remotes/origin/koala/bear renamer &&
424
425
- git checkout --track origin/koala/bear &&
426
- test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
427
- test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
425
+ git checkout --track origin/koala/bear &&
426
+ test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
427
+ test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
428
429
- git checkout main && git branch -D koala/bear &&
429
+ git checkout main && git branch -D koala/bear &&
430
431
- git checkout --track refs/remotes/origin/koala/bear &&
432
- test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
433
- test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
431
+ git checkout --track refs/remotes/origin/koala/bear &&
432
+ test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
433
+ test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
434
435
- git checkout main && git branch -D koala/bear &&
435
+ git checkout main && git branch -D koala/bear &&
436
437
- git checkout --track remotes/origin/koala/bear &&
438
- test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
439
- test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
437
+ git checkout --track remotes/origin/koala/bear &&
438
+ test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
439
+ test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
440
'
441
442
test_expect_success 'checkout with --track, but without -b, fails with too short tracked name' '
443
- test_must_fail git checkout --track renamer
443
+ test_must_fail git checkout --track renamer
444
'
445
446
setup_conflicting_index () {