git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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
Next: Andy Shevchenko
Message 1 of 10 in “git rebase issue”
  1. Andy ShevchenkoMar 13, 2023
  2. Andy ShevchenkoMar 13, 2023
  3. Andy ShevchenkoMar 20, 2023
  4. Felipe ContrerasMar 20, 2023
  5. Jeff KingMar 20, 2023
  6. Andy ShevchenkoMar 20, 2023
  7. Felipe ContrerasMar 23, 2023
  8. Andy ShevchenkoMar 24, 2023
  9. Andy ShevchenkoMar 22, 2025
  10. Eric SunshineMar 23, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.