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

Re: [PATCH v1] rebase -i: stop checking out the tip of the branch to rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 22, 2020, 20:24 UTC
Message-ID
<xmqqa76f6xzt.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20200121191857.23047-1-alban.gruin@gmail.com>
Alban Gruin <alban.gruin@gmail.com> writes:
> This introduces a visible change: as we do not switch on the tip of the
> branch to rebase, no reflog entry is created at the beginning of the
> rebase for it.

Fortunately, this does not mean "git log @{-1}.." during a rebase starts to behave differently. If it were the case, that would have been a bad regression, but that is not the case.

If you omit one reflog entry, you are creating TWO changes. The detaching of the HEAD to the "onto" commit would record, just like any other reflog entry, would record from which commit we detached HEAD from. That reflog entry will also be different, as you'd be switching from a different commit.

I am not sure what the implication of this difference will be in practice, though, but it must be smaller than the effect of the missing reflog entry discussed earlier.

Previous: Elijah NewrenNext: Junio C Hamano
Message 8 of 22 in “Unreliable 'git rebase --onto'”
  1. Eugeniu RoscaJan 8, 2020
  2. SZEDER GáborJan 8, 2020
  3. Elijah NewrenJan 9, 2020
  4. SZEDER GáborJan 9, 2020
  5. Elijah NewrenJan 9, 2020
  6. rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin, Jan 21, 2020
  7. Elijah NewrenJan 21, 2020
  8. Junio C HamanoJan 22, 2020
  9. Junio C HamanoJan 22, 2020
  10. Alban GruinJan 24, 2020
  11. rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin, Jan 24, 2020
  12. Alban GruinJan 24, 2020
  13. Junio C HamanoJan 24, 2020
  14. rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin, Jan 24, 2020
  15. Junio C HamanoJan 24, 2020
  16. Johannes SchindelinFeb 5, 2020
  17. Andrei RybakJan 24, 2020
  18. Eugeniu RoscaJan 9, 2020
  19. Eugeniu RoscaJan 9, 2020
  20. Elijah NewrenJan 9, 2020
  21. Eugeniu RoscaJan 10, 2020
  22. Elijah NewrenJan 10, 2020

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.