On Tue, Apr 2, 2024 at 12:29 PM <phillip.wood123@xxxxxxxxx> wrote: > > Hi Tamir > > On 02/04/2024 11:26, Tamir Duberstein wrote: > > On Tue, Apr 2, 2024 at 11:10 AM Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: > >> On 31/03/2024 07:49, Eric Sunshine wrote: > >> Thanks Eric. I'd have thought that "git worktree list" would say > >> something about the branch being rebased if there was enough state lying > >> around to prevent the branch being deleted, but lets see. What does > >> > >> ls $(git rev-parse --git-path rebase-merge) $(git rev-parse > >> --git-path rebase-apply) > >> > >> show when you run it in <my source dir>? Also is <my source dir> the > >> only worktree? > > > > % ls $(git rev-parse --git-path rebase-merge) $(git rev-parse > > --git-path rebase-apply) > > ls: .git/rebase-apply: No such file or directory > > ls: .git/rebase-merge: No such file or directory > > Thanks for trying that - at least we know it isn't a problem with > rebase. Lets check if there is a stale bisect (sorry I forgot about that > earlier). What do > > cat .git/BISECT_START > ls .git | grep -i bisect > > show? This was the culprit! There was indeed a ` .git/BISECT_START` containing "cleanup". After deleting this file I am able to remove the branch. > > Yes, it's the only worktree. > In that case can you check that > > ls .git/worktrees > > fails because the directory is missing or shows an empty directory please. % cat .git/worktrees cat: .git/worktrees: No such file or directory > Thanks > > Phillip I guess the only action item would be to improve the error message.
