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

Re: `git rebase (--no-fork-point) --onto=<newbase> [<upstream> [<branch>]]` leaves HEAD detached and *HEAD not moved when <branch> is exactly `HEAD`

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Sep 2, 2024, 09:04 UTC
Message-ID
<981c8e52-e51d-4aab-a970-bb41315e02cb@gmail.com>
In-Reply-To
<xmqq1q23pegz.fsf@gitster.g>
Hi Junio
On 01/09/2024 16:42, Junio C Hamano wrote:
Show 6 quoted lines
> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> "<branch>" is expected to be a
>> branch name, not a symbolic ref to the branch like "HEAD".
> 
> I question the correctness of this, though.
Yes as you explain below, it is a bit of an over simplification
Show 11 quoted lines
> The "what to rebase"
> argument can be any arbitrary commit-ish, and if it is a name of a
> local branch, that branch is rebased.  If it is not, the HEAD is
> detached and that detached HEAD state is rebased.  The latter is
> handy when you are unsure if you want to really touch the branch.
> i.e. "git rebase master topic^0"---this way you'd end up on a
> detached HEAD that shows what would happen if you really rebased
> "topic" branch, but if you do not like the result, you can just
> discard the state by e.g., checking out some branch, and you do not
> even contaminate the reflog of the "topic" branch with the record of
> this failed exeriment.
 >
Show 6 quoted lines
> I have a mild suspicion that the "rebase" command might have changed
> its behaviour since the days back when it was implemented as a shell
> script, when the "what to rebase" argument is HEAD, as the most
> natural implementation to do this "optionally first switch to it
> when the argument is given" in the scripted Porcelain is to actually
> run "git checkout HEAD", which should be a somewhat noisy no-op.j

It appears to have changed in 0cb06644a5 (rebase [--onto O] A B: omit needless checkout, 2008-03-15). That also changed the reflog messages written by "git rebase <upstream> <branch>" so that "git checkout @{n}" does not see the new branch being checked out.

Best Wishes
Phillip
Previous: Han JiangNext: Junio C Hamano
Message 5 of 6 in “`git rebase (--no-fork-point) --onto=<newbase> [<upstream> [<branch>]]` leaves HEAD detached and *HEAD not moved when <branch> is exactly `HEAD`”
  1. Han JiangSep 1, 2024
  2. Phillip WoodSep 1, 2024
  3. Junio C HamanoSep 1, 2024
  4. Han JiangSep 1, 2024
  5. Phillip WoodSep 2, 2024
  6. Junio C HamanoSep 3, 2024

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.