Re: git rebase issue

From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Mar 22, 2025, 13:42 UTC
Message-ID: <CAHp75Vf8bB8o9feJHe4FpNo0TnfoRLG+C0roD4a1OaqN3NDj-A@mail.gmail.com>
In-Reply-To: <20230320170158.GA2614670@coredump.intra.peff.net>

On Mon, Mar 20, 2023 at 7:02 PM Jeff King <peff@peff.net> wrote:

Show 26 quoted lines

> On Mon, Mar 20, 2023 at 02:10:38PM +0200, Andy Shevchenko wrote:
>
> > > > With the new release I have got an error
> > > >
> > > >   fatal: 'netboot' is already checked out at ...
> > > >
> > > > To work around this I have to split the above to
> > > >
> > > >   git checkout --ignore-other-worktrees "$branch"
> > > >   git rebase --rebase-merges -X ours --onto "$newbase" "$oldbase"
> > > >
> > > > which makes all these too inconvenient.
> > > >
> > > > Any suggestions?
> >
> > So, what should I do? Today I got again to help manually with my (used
> > to working) scripts.
>
> Running "git log --grep=already.checked.out" suggests that it may be
> b5cabb4a967 (rebase: refuse to switch to branch already checked out
> elsewhere, 2020-02-23).
>
> Adding its author to the cc, who may be able to say more. But my
> understanding is that this was probably fixing a bug (though I don't
> know all the implications of having a branch checked out in multiple
> worktrees).

FWIW, the last couple of versions (since I was not updating Git from the sources too often, usually once per half a year or so, I don't know the exact version which fixes it to me, and I don't want spend time to find that, because it works :) of Git seem to work properly to me. Thank you to everyone who made that happen!

-- 
With Best Regards,
Andy Shevchenko