Fix for #555 - issues with merge + shallow clones #556
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
libgit2 doesn't support shallow clones, and so operations that involve walking back through the commits like `git_merge_base` can fail (depending on the exact circumstances). This workaround simply switches to using `git merge-base` instead - the same functionality, but from within git, which does support shallow clones. Adds a test case to show it is fixed.
craigds
approved these changes
Feb 17, 2022
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 doesn't support shallow clones, and so operations that involve
walking back through the commits like
git_merge_basecan fail(depending on the exact circumstances).
This workaround simply switches to using
git merge-baseinstead - thesame functionality, but from within git, which does support shallow clones.
Adds a test case to show it is fixed.
Fixes #555
Checklist: