Skip to content

Commit b74d3d6

Browse files
committed
SQUASH??? adjust tests for case challenged systems
1 parent d6e1ee4 commit b74d3d6

File tree

1 file changed

+33
-31
lines changed

1 file changed

+33
-31
lines changed

t/t4215-log-skewed-merges.sh

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,13 @@ test_expect_success 'log --graph with multiple tips' '
371371
'
372372

373373
test_expect_success 'log --graph with root commit' '
374-
git checkout --orphan 8_a &&
374+
git checkout --orphan branch_8_a &&
375375
test_commit 8_A &&
376376
test_commit 8_A1 &&
377-
git checkout --orphan 8_b &&
377+
git checkout --orphan branch_8_b &&
378378
test_commit 8_B &&
379379
380-
check_graph 8_b 8_a <<-\EOF
380+
check_graph branch_8_b branch_8_a <<-\EOF
381381
* 8_B
382382
* 8_A1
383383
/
@@ -387,10 +387,10 @@ test_expect_success 'log --graph with root commit' '
387387

388388
test_expect_success 'log --graph with multiple root commits' '
389389
test_commit 8_B1 &&
390-
git checkout --orphan 8_c &&
390+
git checkout --orphan branch_8_c &&
391391
test_commit 8_C &&
392392
393-
check_graph 8_c 8_b 8_a <<-\EOF
393+
check_graph branch_8_c branch_8_b branch_8_a <<-\EOF
394394
* 8_C
395395
* 8_B1
396396
/
@@ -402,18 +402,18 @@ test_expect_success 'log --graph with multiple root commits' '
402402
'
403403

404404
test_expect_success 'log --graph commit from a two parent merge shifted' '
405-
git checkout --orphan 9_b &&
405+
git checkout --orphan branch_9_b &&
406406
test_commit 9_B &&
407-
git checkout --orphan 9_c &&
407+
git checkout --orphan branch_9_c &&
408408
test_commit 9_C &&
409-
git checkout 9_b &&
410-
git merge 9_c --allow-unrelated-histories -m 9_M &&
411-
git checkout --orphan 9_a &&
409+
git checkout branch_9_b &&
410+
git merge branch_9_c --allow-unrelated-histories -m 9_M &&
411+
git checkout --orphan branch_9_a &&
412412
test_commit 9_A &&
413413
test_commit 9_A1 &&
414414
test_commit 9_A2 &&
415415
416-
check_graph 9_a 9_b <<-\EOF
416+
check_graph branch_9_a branch_9_b <<-\EOF
417417
* 9_A2
418418
* 9_A1
419419
* 9_A
@@ -425,22 +425,23 @@ test_expect_success 'log --graph commit from a two parent merge shifted' '
425425
'
426426

427427
test_expect_success 'log --graph commit from a three parent merge shifted' '
428-
git checkout --orphan 10_b &&
428+
git checkout --orphan branch_10_b &&
429429
test_commit 10_B &&
430-
git checkout --orphan 10_c &&
430+
git checkout --orphan branch_10_c &&
431431
test_commit 10_C &&
432-
git checkout --orphan 10_d &&
432+
git checkout --orphan branch_10_d &&
433433
test_commit 10_D &&
434-
git checkout 10_b &&
434+
git checkout branch_10_b &&
435435
TREE=$(git write-tree) &&
436-
MERGE=$(git commit-tree $TREE -p 10_b -p 10_c -p 10_d -m 10_M) &&
436+
MERGE=$(git commit-tree $TREE \
437+
-p branch_10_b -p branch_10_c -p branch_10_d -m 10_M) &&
437438
git reset --hard $MERGE &&
438-
git checkout --orphan 10_a &&
439+
git checkout --orphan branch_10_a &&
439440
test_commit 10_A &&
440441
test_commit 10_A1 &&
441442
test_commit 10_A2 &&
442443
443-
check_graph 10_a 10_b <<-\EOF
444+
check_graph branch_10_a branch_10_b <<-\EOF
444445
* 10_A2
445446
* 10_A1
446447
* 10_A
@@ -453,24 +454,25 @@ test_expect_success 'log --graph commit from a three parent merge shifted' '
453454
'
454455

455456
test_expect_success 'log --graph commit from a four parent merge shifted' '
456-
git checkout --orphan 11_b &&
457+
git checkout --orphan branch_11_b &&
457458
test_commit 11_B &&
458-
git checkout --orphan 11_c &&
459+
git checkout --orphan branch_11_c &&
459460
test_commit 11_C &&
460-
git checkout --orphan 11_d &&
461+
git checkout --orphan branch_11_d &&
461462
test_commit 11_D &&
462-
git checkout --orphan 11_e &&
463+
git checkout --orphan branch_11_e &&
463464
test_commit 11_E &&
464-
git checkout 11_b &&
465+
git checkout branch_11_b &&
465466
TREE=$(git write-tree) &&
466-
MERGE=$(git commit-tree $TREE -p 11_b -p 11_c -p 11_d -p 11_e -m 11_M) &&
467+
MERGE=$(git commit-tree $TREE \
468+
-p branch_11_b -p branch_11_c -p branch_11_d -p branch_11_e -m 11_M) &&
467469
git reset --hard $MERGE &&
468-
git checkout --orphan 11_a &&
470+
git checkout --orphan branch_11_a &&
469471
test_commit 11_A &&
470472
test_commit 11_A1 &&
471473
test_commit 11_A2 &&
472474
473-
check_graph 11_a 11_b <<-\EOF
475+
check_graph branch_11_a branch_11_b <<-\EOF
474476
* 11_A2
475477
* 11_A1
476478
* 11_A
@@ -484,17 +486,17 @@ test_expect_success 'log --graph commit from a four parent merge shifted' '
484486
'
485487

486488
test_expect_success 'log --graph disconnected three roots cascading' '
487-
git checkout --orphan 12_d &&
489+
git checkout --orphan branch_12_d &&
488490
test_commit 12_D &&
489491
test_commit 12_D1 &&
490-
git checkout --orphan 12_c &&
492+
git checkout --orphan branch_12_c &&
491493
test_commit 12_C &&
492-
git checkout --orphan 12_b &&
494+
git checkout --orphan branch_12_b &&
493495
test_commit 12_B &&
494-
git checkout --orphan 12_a &&
496+
git checkout --orphan branch_12_a &&
495497
test_commit 12_A &&
496498
497-
check_graph 12_a 12_b 12_c 12_d <<-\EOF
499+
check_graph branch_12_a branch_12_b branch_12_c branch_12_d <<-\EOF
498500
* 12_A
499501
* 12_B
500502
* 12_C

0 commit comments

Comments
 (0)