git rebase issue
- From
Andy Shevchenko <andy.shevchenko@gmail.com>
- Date
- Mar 13, 2023, 12:35 UTC
- Message-ID
- <CAHp75VfTQZ8vFQXZKgbsedG2BOad-pv9fCVkNkX+kFAxhnhhXQ@mail.gmail.com>
Hi!
Recently Debian has updated the Git to 2.39.2 and broke my user case (I believe it's a problem in the Git itself and not Debian packaging or so).
So, my use case is to run
git rebase --rebase-merges -X ours --onto "$newbase" "$oldbase" "$branch"
in the repository that is made out of bare + a few worktrees.
Previously everything was working (my bare repository points to one of the existing branch: In shell prompt: ...(BARE:netboot)]$
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?
-- With Best Regards, Andy Shevchenko