Update to libgit2 0.21 #374
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
We no longer need the max-path define, so we can get rid of that and the pypy checking.
There is no more MergeResult type. Instead, the user can use Repository.merge_analysis() to get an overview of their options and call git_merge() when they mean to merge. The git_merge() function now also performs a checkout.
We can now use a git_buf to extract the search path.
Reconcile the changes between the ffi changes upstream with the changes to libgit2 in the dev branch. Conflicts: src/config.c src/options.c src/refspec.c src/remote.c
These allow complex reads to come from the same version of the config.
Conflicts: pygit2/decl.h test/test_repository.py
Renaming a remote in pygit2 has been done via Remote.name= up to now, but this is inherently unsafe, as it provides no way to pass up the refspecs that libgit2 was unable to remap. In fact, if there ever was such problem, we would have segfaulted. libgit2 now provides a much more direct way of getting back the results, so expose it as the return value of Remote.rename(). This also removes the hint that a rename might be something that happens only to the in-memory structure.
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.
libgit2 has tagged 0.21.0-rc1, so it's time to send this PR to update the bindings.
There's been quite a lot of changes to libgit2 and its API. I've tried to keep the Python wrapping the same where possible, as a lot of those changes are to do with strings, but e.g.
git_mergehas completely changed how it works to provide the user of the library with the bits they need instead of trying to pretend it was thegit mergecommand.