Show in amending commit list only the first parents #6242
Merged
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.
What it does
This fixes a problem that occurs when amending commits where a commit has more than one parent (such as occurs after a merge). The commits being amended are correctly listed as the commits from the first parent, which would generally be the master branch. However if refreshed then one sees commits from other branches involved in the merges.
@kittaakos found this problem while reviewing #5451
How to test
Review checklist
Reminder for reviewers