Skip to content

Support merge-base #370

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

Jump to bottom
Merged
merged 1 commit into from
Oct 2, 2018
Merged

Support merge-base #370

merged 1 commit into from
Oct 2, 2018

Conversation

EPecherkin
Copy link

@EPecherkin EPecherkin commented Jun 14, 2018 •
edited
Loading

Add support for git merge-base, which finds as good common ancestors as possible for a merge

Usage example:
g.merge_base('branch1', 'branch2', ..., options)

Possible options:

{
    all: true,
    octopus: true,
    fork_point: true,
    independent: true
}

The method returns an array of Git::Object::Commit. The amount of items depends on the particular case

@EPecherkin EPecherkin force-pushed the add-merge-base branch 4 times, most recently from 5fb2459 to 008bdce Compare June 14, 2018 23:36
@EPecherkin EPecherkin changed the title Add merge base Support merge-base Jun 14, 2018
@EPecherkin EPecherkin force-pushed the add-merge-base branch 3 times, most recently from cc30bd4 to 153ab76 Compare June 19, 2018 17:20
@robkinyon-roivant
Copy link

Bump. Is there something I can help with to move this along?

@tarcinil tarcinil requested a review from perlun July 28, 2018 01:42
@tarcinil
Copy link
Contributor

@EPecherkin Can you please add DCO to your commits? Thank you.

tarcinil
tarcinil approved these changes Aug 26, 2018
View reviewed changes
Copy link
Contributor

@tarcinil tarcinil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. 👍

@perlun
Copy link
Contributor

perlun commented Sep 19, 2018

@EPecherkin Please add the DCO and we'll merge this ASAP.

Support merge-base
cf8aa6d 
Signed-off-by: Evgenii Pecherkin <evgenii@toptal.com>
@EPecherkin
Copy link
Author

@perlun @tarcinil done

@tarcinil tarcinil merged commit a4fbb6b into ruby-git:master Oct 2, 2018
@ngeri
Copy link

ngeri commented Oct 9, 2018 •
edited
Loading

Hi, Is it possible to add "--is-ancestor" parameter as well?
@EPecherkin

c-f pushed a commit to c-f/ruby-git that referenced this pull request Oct 9, 2018
Support merge-base (ruby-git#370)
c825eae 
Signed-off-by: Evgenii Pecherkin <evgenii@toptal.com>
Signed-off-by: invist@thinkpwn <cf@cw>
@perlun
Copy link
Contributor

perlun commented Oct 29, 2018

@ngergo100

Hi, Is it possible to add "--is-ancestor" parameter as well?

Please add this as a separate PR/GitHub issue. I will close this now and we can continue the discussion there.

@ruby-git ruby-git locked as resolved and limited conversation to collaborators Oct 29, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tarcinil tarcinil tarcinil approved these changes

@perlun perlun Awaiting requested review from perlun

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@EPecherkin @robkinyon-roivant @tarcinil @perlun @ngeri