| 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='merge-base with ancestor among merge-base candidates |
| 4 | |
| 5 | Test that merge-base --all correctly handles cases where |
| 6 | multiple merge-base candidates exist and one is an ancestor |
| 7 | of another. The side-exhaustion optimization in |
| 8 | paint_down_to_common may exit before STALE propagation |
| 9 | removes the ancestor, but remove_redundant catches it. |
| 10 | |
| 11 | Graph shape (parents are below children): |
| 12 | |
| 13 | A ----------- X |
| 14 | |\ /| |
| 15 | | B---------/ | |
| 16 | | | | |
| 17 | e2 \ f2 |
| 18 | | | | |
| 19 | e1 d1 f1 |
| 20 | \ | / |
| 21 | \ | / |
| 22 | \| / |
| 23 | C |
| 24 | |
| 25 | A and X are the two tips. |
| 26 | B and C are both reachable from A and X. |
| 27 | B reaches C through d1. |
| 28 | Only B should appear in merge-base --all output. |
| 29 | ' |
| 30 | |
| 31 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
| 32 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
| 33 | |
| 34 | TEST_PASSES_SANITIZE_LEAK=true |
| 35 | . ./test-lib.sh |
| 36 | |
| 37 | test_expect_success 'setup ancestor merge-base candidate' ' |
| 38 | test_commit C && |
| 39 | |
| 40 | git checkout -b d-chain HEAD && |
| 41 | test_commit d1 && |
| 42 | test_commit B && |
| 43 | |
| 44 | git checkout -b e-path C && |
| 45 | test_commit e1 && |
| 46 | test_commit e2 && |
| 47 | |
| 48 | git checkout -b f-path C && |
| 49 | test_commit f1 && |
| 50 | test_commit f2 && |
| 51 | |
| 52 | git checkout -b branch-A e-path && |
| 53 | test_merge A B && |
| 54 | |
| 55 | git checkout -b branch-X f-path && |
| 56 | test_merge X B && |
| 57 | |
| 58 | git commit-graph write --reachable |
| 59 | ' |
| 60 | |
| 61 | test_expect_success 'merge-base --all excludes ancestor candidate' ' |
| 62 | git rev-parse B >expected && |
| 63 | git merge-base --all A X >actual && |
| 64 | test_cmp expected actual |
| 65 | ' |
| 66 | |
| 67 | test_expect_success 'merge-base (single) finds shallowest' ' |
| 68 | git rev-parse B >expected && |
| 69 | git merge-base A X >actual && |
| 70 | test_cmp expected actual |
| 71 | ' |
| 72 | |
| 73 | # Without commit-graph: generation numbers are INFINITY, |
| 74 | # side-exhaustion optimization does not fire. |
| 75 | test_expect_success 'merge-base --all without commit-graph' ' |
| 76 | rm -f .git/objects/info/commit-graph && |
| 77 | git rev-parse B >expected && |
| 78 | git merge-base --all A X >actual && |
| 79 | test_cmp expected actual |
| 80 | ' |
| 81 | |
| 82 | test_done |