Allow setting merge options in Repository.merge #1008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Up to now, Repository.merge_commits and Repository.merge_trees only allowed the caller to choose the file_favor. This change also allows them to set or unset any of the merge_flags or merge_file_flags, while preserving the default behavior.
|
(@rcoup asked to be cc'd on all pygit2 PRs by koordinates staff) |
|
@rcoup I am not familiar with this repository - can you make sure that the right reviewer sees this? |
|
correct, there are no tests |
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Oct 22, 2020
Includes a build fix for the updated libgit2 1.1.x, figured it may as well be updated at the same time. 1.3.0 (2020-09-18) ------------------------- - New ``Repository.add_submodule(...)`` `#1011 <https://github.com/libgit2/pygit2/pull/1011>`_ - New ``Repository.applies(...)`` `#1019 <https://github.com/libgit2/pygit2/pull/1019>`_ - New ``Repository.revparse(...)`` and ``Repository.revparse_ext(...)`` `#1022 <https://github.com/libgit2/pygit2/pull/1022>`_ - New optional ``flags`` and ``file_flags`` arguments in ``Repository.merge_commits`` and ``Repository.merge_trees`` `#1008 <https://github.com/libgit2/pygit2/pull/1008>`_ - New ``Reference.raw_target``, ``Repository.raw_listall_branches(...)`` and ``Repository.raw_listall_references()``; allow bytes in ``Repository.lookup_branch(...)`` and ``Repository.diff(...)`` `#1029 <https://github.com/libgit2/pygit2/pull/1029>`_ - New ``GIT_BLAME_FIRST_PARENT`` and ``GIT_BLAME_USE_MAILMAP`` constants `#1031 <https://github.com/libgit2/pygit2/pull/1031>`_ - New ``IndexEntry`` supports ``repr()``, ``str()``, ``==`` and ``!=`` `#1009 <https://github.com/libgit2/pygit2/pull/1009>`_ - New ``Object`` supports ``repr()`` `#1022 <https://github.com/libgit2/pygit2/pull/1022>`_ - New accept tuples of strings (not only lists) in a number of places `#1025 <https://github.com/libgit2/pygit2/pull/1025>`_ - Fix compatibility with old macOS 10.9 `#1026 <https://github.com/libgit2/pygit2/issues/1026>`_ `#1027 <https://github.com/libgit2/pygit2/pull/1027>`_ - Fix check argument type in ``Repository.apply(...)`` `#1033 <https://github.com/libgit2/pygit2/issues/1033>`_ - Fix raise exception if error in ``Repository.listall_submodules()`` commit 32133974 - Fix a couple of refcount errors in ``OdbBackend.refresh()`` and ``Worktree_is_prunable`` commit fed0c19c - Unit tests `#800 <https://github.com/libgit2/pygit2/issues/800>`_ `#1015 <https://github.com/libgit2/pygit2/pull/1015>`_ - Documentation `#705 <https://github.com/libgit2/pygit2/pull/705>`_
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Up to now, Repository.merge_commits and Repository.merge_trees only
allowed the caller to choose the file_favor. This change also
allows them to set or unset any of the merge_flags or merge_file_flags,
while preserving the default behavior.