Skip to content
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.

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

Expose 'recursion_limit' option for merges #857

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

wfchandler
Copy link

libgit2 has a recursion_limit option in git_merge_options to
control the potential cost of recursive merging, but this is not
currently exposed in rugged.

This change makes recursion_limit available for use in rugged.

libgit2 has a 'recursion_limit' option in 'git_merge_options' to
control the potential cost of recursive merging, but this is not
currently exposed in rugged.

This change makes 'recursion_limit' available for use in rugged.
@carlosmn
Copy link
Member

Thanks. This would also need to be added to the list of supported options in the documentation for rb_git_tree_merge a bit further down the file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants