Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show in amending commit list only the first parents #6242

Merged
merged 1 commit into from
Sep 23, 2019

Conversation

westbury
Copy link
Contributor

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

  • Create or clone a repository that has a merge commit.
  • Press 'amend' to go back to a commit prior to the merge commit.
  • Note the list of amending commits.
  • Press 'refresh'.
  • Check that the list of amending commits is the same as before refreshing.

Review checklist

Reminder for reviewers

Signed-off-by: Nigel Westbury <nigelipse@miegel.org>
@westbury
Copy link
Contributor Author

See #5451 (comment) for the original report and screen shot.

Copy link
Contributor

@kittaakos kittaakos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It workes as expected. Thank you for the fix. 👍

I have verified it in Gitpod on macOS using Chrome. As the test repository, I have picked https://github.com/TypeFox/find-git-exec.git.

@kittaakos kittaakos merged commit 2aa8f23 into eclipse-theia:master Sep 23, 2019
@westbury westbury deleted the fix-amending-list branch February 28, 2020 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants