Phantom rebase-merge directory (rm -rf ".git/rebase-merge") #1732
Description
➤ git rebase chore-lint-and-doc-changes-tweak-unknown-action
fatal: It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr "/Users/me/repos/MY_APP/.git/worktrees/MY_APP2/rebase-merge"
and run me again. I am stopping in case you still have something
valuable there.
➤ git status
On branch chore-update-next-wip
Your branch and 'origin/chore-update-next-wip' have diverged,
and have 33 and 19 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You are currently rebasing.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
➤ git rebase --abort
warning: could not read '/Users/me/repos/MY_APP/.git/worktrees/MY_APP2/rebase-merge/head-name': No such file or directory
➤ cat /Users/me/repos/MY_APP/.git/worktrees/MY_APP2/rebase-merge
cat: /Users/me/repos/MY_APP/.git/worktrees/MY_APP2/rebase-merge: Is a directory
➤ ls /Users/me/repos/MY_APP/.git/worktrees/MY_APP2/rebase-merge
git-rebase-todo
➤ cat /Users/me/repos/MY_APP/.git/worktrees/MY_APP2/rebase-merge/git-rebase-todo
➤ code .
I'll have to apologize, I do not have gitlens debug output enabled.
- GitLens Version: v11.7.0
- Git Version: 2.34.0 (very recently updated)
CPUs | Apple M1 (8 x 24)
-- | --
GPU Status | 2d_canvas: enabled gpu_compositing: enabled metal: disabled_off multiple_raster_threads: enabled_on oop_rasterization: enabled opengl: enabled_on rasterization: enabled skia_renderer: disabled_off_ok video_decode: enabled webgl: enabled webgl2: enabled
Load (avg) | 2, 2, 2
Memory (System) | 16.00GB (0.01GB free)
Process Argv | --crash-reporter-id aad11fcf-6f4b-42d6-a3a5-281835fd9d8b
Screen Reader | no
VM | 0%
Steps to Reproduce:
I will help fill these in next time the issue happens.
I am using the modern git lens rebase-todo gui, but I also use command line some.
I feel I almost never ran into this issue with git 2.33.0, so I have my suspicions there.
I suspect that when the gitlens todo gui is closed, there should be a check to see if rebase-merge dir has one file, git-rebase-todo which is empty