On Mon, Mar 20, 2023 at 6:32 AM Andy Shevchenko <andy.shevchenko@xxxxxxxxx> wrote: > > On Mon, Mar 13, 2023 at 2:58 PM Andy Shevchenko > <andy.shevchenko@xxxxxxxxx> wrote: > > On Mon, Mar 13, 2023 at 2:35 PM Andy Shevchenko > > <andy.shevchenko@xxxxxxxxx> wrote: > > > > > > 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). > > > > Forgot to add that last week it was working nicely (I don't remember > > the version, but according to Debian changelog it looks like 2.38.4 > > was working fine to me. > > > > > 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? > > So, what should I do? Today I got again to help manually with my (used > to working) scripts. Do you have a sequence of steps to reproduce the issue? With that it should be trivial to do `git bisect` and figure out which commit introduced the regression. -- Felipe Contreras
