fix: use correct base in diff #1178
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
didroe
force-pushed
the
fix/use-correct-base-in-diff
branch
from
f9a6551
to
f5b757d
Compare
elsapet
approved these changes
Aug 8, 2023
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.
Description
Use the correct base branch commit for diffing. ie. the latest common ancestor between the base branch and current commit.
Previously we were using the latest commit of the base branch to compare, which is incorrect.
We use the Github API or a passed in SHA (for Gitlab) as a preference, and fall back to computing the merge base commit. If not enough history is present to compute the merge base, an error is raised. This could be extended in future to try and fetch the history.
Related
Checklist