From 0606bf541cf88a759f859e896f407379c523d1ab Mon Sep 17 00:00:00 2001 From: Nikolaus Schuetz Date: Sun, 12 Jul 2026 10:10:43 -0700 Subject: [PATCH] merge-base: add tests for --is-ancestor `git merge-base --is-ancestor A B` is used a lot in scripts but has no tests. Add some to t6010 covering its exit codes: 0 when A is an ancestor of B, 1 when it is not, and 128 (not 1) when given a bad argument. Also check that --is-ancestor and --all can't be combined, and that the resulting error names both options. Signed-off-by: Nikolaus Schuetz --- t/t6010-merge-base.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 44c726ea397cf1..5196c30ff6dd45 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -305,4 +305,37 @@ test_expect_success 'merge-base --octopus --all for complex tree' ' test_cmp expected actual ' +# These reuse the E---D---C---B---A history plus the G and H merges set up +# in "set up G and H" above: E is an ancestor of A, while G and H are on +# diverged branches. +test_expect_success '--is-ancestor with an ancestor and a descendant' ' + git merge-base --is-ancestor $E $A && + test_expect_code 1 git merge-base --is-ancestor $A $E +' + +test_expect_success '--is-ancestor treats a commit as its own ancestor' ' + git merge-base --is-ancestor $A $A +' + +test_expect_success '--is-ancestor with diverged commits' ' + test_expect_code 1 git merge-base --is-ancestor $G $H && + test_expect_code 1 git merge-base --is-ancestor $H $G +' + +test_expect_success '--is-ancestor exits 128 on a bad commit' ' + test_expect_code 128 git merge-base --is-ancestor $A no-such-commit && + test_expect_code 128 git merge-base --is-ancestor no-such-commit $A +' + +test_expect_success '--is-ancestor requires exactly two commits' ' + test_expect_code 129 git merge-base --is-ancestor && + test_expect_code 129 git merge-base --is-ancestor $A && + test_expect_code 128 git merge-base --is-ancestor $E $A $B +' + +test_expect_success '--is-ancestor and --all cannot be used together' ' + test_expect_code 128 git merge-base --is-ancestor --all $E $A 2>err && + test_grep "options .--is-ancestor. and .--all. cannot be used together" err +' + test_done