git rebase issue

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux