Skip to content

merge-base: add tests for --is-ancestor #2186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikolauspschuetz wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −0
Open

merge-base: add tests for --is-ancestor #2186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions t/t6010-merge-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,4 +305,38 @@ test_expect_success 'merge-base --octopus --all for complex tree' '
test_cmp expected actual
'

test_expect_success 'setup --is-ancestor' '
git init is-ancestor &&
(
cd is-ancestor &&
test_commit one &&
test_commit two &&
git checkout -b side one &&
test_commit three
)
'

test_expect_success '--is-ancestor parent and child' '
git -C is-ancestor merge-base --is-ancestor one two &&
test_expect_code 1 git -C is-ancestor merge-base --is-ancestor two one
'

test_expect_success '--is-ancestor self' '
git -C is-ancestor merge-base --is-ancestor two two
'

test_expect_success '--is-ancestor diverged commits' '
test_expect_code 1 git -C is-ancestor merge-base --is-ancestor three two
'

test_expect_success '--is-ancestor exit 128 non-existent commit' '
test_expect_code 128 git -C is-ancestor merge-base --is-ancestor one no-such-commit &&
test_expect_code 128 git -C is-ancestor merge-base --is-ancestor no-such-commit one
'

test_expect_success '--is-ancestor and --all cannot be used together' '
test_expect_code 128 git -C is-ancestor merge-base --is-ancestor --all one two 2>err &&
test_grep "options .--is-ancestor. and .--all. cannot be used together" err
'

test_done
Loading