Revert merge commit with no changes on mainline gets stuck on reverting
Open
Nobody has claimed this yet.
bug
- Dominant language
- Lua
- Stars
- 5.6k
- Forks
- 357
- Avg merge
- 15h 47m
- Merged PRs (30d)
- 2
Description
When I revert a merge commit with no changes via the command line. The following happens
$ git revert d0cb49c -m 1
On branch xyz
nothing to commit, working tree clean
When I do the same in neogit (by providing =m 1), I get stuck on reverting
Doing continue (vc) does nothing. Doing skip (vs) aborts the revert (same result as in commandline).
I would expect just an information popup with the text
On branch xyz
nothing to commit, working tree clean
without getting stuck like this.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Reproduce the no-op merge revert in Neogit using the command-line example and the -m 1 option, then trace the revert, continue, and skip handling. Done means the no-op result shows an information popup with the clean working-tree message instead of leaving the revert state stuck.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, lua, neovim
- Domain
- tooling
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 45/100