Fix issue 4997 - Rebase/Fixup/Reword/Squash/Patch/Drop onto wrong commit (sibling branch) when git.log.showWholeGraph=true #5008
+139
−69
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.
PR Description
Fixes: #4997
This PR fixes bug mentioned in #4997 except the bug on interactive-rebase "i".
I have yet to figure out a way to get common ancestor to quickly obtains all the commits from the feature branch starting from the common ancestor.
Otherwise, the current approach shown below will still cause issue when git.log.showWholeGraph=true.
Please check if the PR fulfills these requirements
go generate ./...)