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

Aborting 'rebase main feat' removes unversioned files

From
FBFedor Biryukov <fedor.birjukov@gmail.com>
Date
Sep 3, 2021, 20:33 UTC
Message-ID
<C357A648-8B13-45C3-9388-C0C7F7D40DAE@gmail.com>
In-Reply-To
<CAG2t84Uaw-Kdp+EXU8CY1QYfykFQj-hGLJnTSH8MYO8Vi_yqgA@mail.gmail.com>
Looks like a bug in git rebase main feat.

To reproduce: git init git commit -m 'init' --allow-empty git checkout -b feat echo 123 > readme.txt git add readme.txt git commit -m 'txt=123' git checkout main echo 012 > readme.txt git rebase main feat git rebase --abort

Expected result: readme.txt contains 012

Actual result: readme.txt contains 123

According to the docs, git rebase main feat is a shorthand for git checkout feat followed by git rebase main. I have checked that doing checkout and rebase separately instead of using the shorthand does not have the same issue.
Cheers!
Fedor
Next: Bagas Sanjaya
Message 1 of 15 in “Aborting 'rebase main feat' removes unversioned files”
  1. Fedor BiryukovSep 3, 2021
  2. Bagas SanjayaSep 4, 2021
  3. Jeff KingSep 4, 2021
  4. Fedor BiryukovSep 4, 2021
  5. Fedor BiryukovSep 4, 2021
  6. Fedor BiryukovSep 4, 2021
  7. Jeff KingSep 4, 2021
  8. Fedor BiryukovSep 4, 2021
  9. Jeff KingSep 4, 2021
  10. Elijah NewrenSep 5, 2021
  11. Ævar Arnfjörð BjarmasonSep 5, 2021
  12. Fedor BiryukovSep 5, 2021
  13. Elijah NewrenSep 8, 2021
  14. Junio C HamanoSep 5, 2021
  15. Elijah NewrenSep 8, 2021

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.