From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Son Luong Ngoc via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
Son Luong Ngoc <sluongng@gmail.com>
Subject: Re: [PATCH v3 1/2] rebase: skip branch symref aliases
Date: Wed, 29 Jul 2026 07:26:57 -0700 [thread overview]
Message-ID: <xmqqwludan2m.fsf@gitster.g> (raw)
In-Reply-To: <61291144-60da-4e37-83ef-fe09e91c4f51@gmail.com> (Phillip Wood's message of "Wed, 29 Jul 2026 10:31:34 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
>> But that was about a low level mechanism that must be more lenient
>> to be usable as repair tools to recover from such a broken state,
>> no?
>
> It checks the new value of HEAD, not the old one so I don't think so.
> The commit message talks about topgit using "git symbolic-ref" to set
> head outside "refs/heads/" - peff had previously tried to tighten it to
> reject non-branch refs but that broke topgit. I've just had a quick look
> at the topgit code and still sets HEAD to point to "refs/top-bases/..."
> by default[1], although there are plans to start using
> "refs/heads/{top-bases}/..." instead.
Ah, that name vaguely rings a bell. Is it still in use, and now
they prevent us from forbidding funny characters like {} in the
refname? Sigh...
> ... It
> appears topgit's rebase command is built around "git rebase"[2] so I
> think we need to continue to support rebasing a non-branch HEAD.
Sigh, again, but OK.
Thanks.
next prev parent reply other threads:[~2026-07-29 14:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-28 5:41 [PATCH 0/2] rebase: handle --update-refs branch symrefs Son Luong Ngoc via GitGitGadget
2026-05-28 5:42 ` [PATCH 1/2] t3404: add failing branch symref test Son Luong Ngoc via GitGitGadget
2026-06-01 13:52 ` Phillip Wood
2026-05-28 5:42 ` [PATCH 2/2] rebase: skip branch symref aliases Son Luong Ngoc via GitGitGadget
2026-05-28 7:08 ` Kristoffer Haugsbakk
2026-06-01 14:10 ` Phillip Wood
2026-05-28 20:42 ` [PATCH 0/2] rebase: handle --update-refs branch symrefs Junio C Hamano
2026-06-03 10:27 ` [PATCH v2] rebase: skip branch symref aliases Son Luong Ngoc via GitGitGadget
2026-06-04 15:37 ` Phillip Wood
2026-07-22 8:16 ` Son Luong Ngoc
2026-07-22 8:15 ` [PATCH v3 0/2] rebase: handle --update-refs branch symrefs Son Luong Ngoc via GitGitGadget
2026-07-22 8:15 ` [PATCH v3 1/2] rebase: skip branch symref aliases Son Luong Ngoc via GitGitGadget
2026-07-23 18:58 ` Phillip Wood
2026-07-24 9:55 ` Phillip Wood
2026-07-25 11:21 ` Erik Cervin-Edin
2026-07-26 15:42 ` Junio C Hamano
2026-07-28 9:36 ` Phillip Wood
2026-07-28 14:23 ` Junio C Hamano
2026-07-29 9:31 ` Phillip Wood
2026-07-29 14:26 ` Junio C Hamano [this message]
2026-07-30 13:10 ` Phillip Wood
2026-07-22 8:15 ` [PATCH v3 2/2] rebase: guard non-branch symref targets Son Luong Ngoc via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwludan2m.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sluongng@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox