fix(git): special case for git rebase -i --root for early commit#577
Open
ButterSus wants to merge 1 commit intosindrets:mainfrom
Open
fix(git): special case for git rebase -i --root for early commit#577ButterSus wants to merge 1 commit intosindrets:mainfrom
ButterSus wants to merge 1 commit intosindrets:mainfrom
Conversation
|
Thanks so much, @ButterSus! I ran into this issue as well and your fix worked great. Any chance this could get merged? |
dlyongemallo
pushed a commit
to dlyongemallo/diffview.nvim
that referenced
this pull request
Feb 4, 2026
When running `git rebase -i --root`, the initial commit has no parent, so `git merge-base` fails. Instead of crashing with an assertion error, gracefully handle this by using the empty tree SHA as the base. Fixes sindrets#576
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #576