Update libgit2 to c5cacc4 #76
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
- Fix segfaults caused by invalid object creation (GH#66) (thanks, @pipcet!) - Add Config -> default() method (GH#67) (thanks, @magnolia-k!) - Do not fail when a lightweight tag is found in the Tag->foreach() callback (GH#68) (thanks, @pipcet!) - Add Tree::Entry -> file_mode() method (GH#69) (thanks, @pipcet!) - Repository -> merge() now takes %merge_opts and %checkout_opts as 2 separate parameters. (incompatible change) (GH#70) - Merge options parameter member 'automerge' has been renamed to 'favor', inline with libgit2 API changes. (incompatible changes) (GH#70) It has also learned about a 'union' merge. - Checkout options has learned new options: 'target_directory', 'ancestor_label', 'our_label' and 'their_label'. (GH#70) - Checkout strategy has additional options: (GH#70) 'use_ours', 'use_theirs', 'skip_locked_directories', 'dont_overwrite_ignored', 'conflict_style_merge', 'conflict_style_diff3' and 'disable_pathspec_match'. - Added new Repository methods (#GH70): + Repository -> merge_analysis() + Repository -> merge_base() - Added new Index methods (#GH70): + Index -> write_tree_to() + Index -> checkout() + Index -> entries() + Index -> add_conflict() + Index -> remove_conflict() - Added new Commit method (#GH70): + Commit -> merge() - Added new Tree method (#GH70): + Tree -> merge() - Index -> add() now either takes a path or a Index::Entry (GH#70) - Remote->create_inmemory() has been replaced by Remote->create_anonymous() (incompatible change) (GH#71). The order of 'url' and 'fetchspec' has also been reversed to bring it inline with the upstream changes. - Update libgit2 to bcc6229
|
Merged, thanks! |
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.
This updates
libgit2to libgit2/libgit2@c5cacc4. I've contributed some code to getgit cherry-pickandgit format-patchto work.This update allows for those PR's to be created. Looks like
git subtreedidn't mess this one up.