kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ns/merge-base-is-ancestor-tests' into next 

Tests for 'git merge-base --is-ancestor' have been added to cover
exit codes (0 for success, 1 for non-ancestor, 128 for errors) and
to ensure it cannot be combined with '--all'.

* ns/merge-base-is-ancestor-tests:
  merge-base: add tests for --is-ancestor
next
Junio C Hamano 2026-08-03 09:33:11 -07:00
parent 7643cf1c2a 89454a60ed
commit cf2c4e00eb
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
t/t6010-merge-base.sh
View File

@ -305,4 +305,35 @@ test_expect_success 'merge-base --octopus --all for complex tree' '
test_cmp expected actual
'

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 2>err &&
test_grep ".--is-ancestor takes exactly two commits" err
'

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