git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
To: git@vger.kernel.org
Cc: "Patrick Steinhardt" <ps@pks.im>
Subject: Re: What’s the intended/reasonable usage patterns for symrefs?
Date: Fri, 20 Jun 2025 17:29:24 +0200	[thread overview]
Message-ID: <74ee41f3-a9dd-4a9a-9350-33ffef7dea23@app.fastmail.com> (raw)
In-Reply-To: <4e3c2840-37f3-43f8-9d8a-b4a106d8d18a@app.fastmail.com>

On Mon, Nov 4, 2024, at 11:45, Kristoffer Haugsbakk wrote:
> On Wed, Oct 16, 2024, at 19:23, Kristoffer Haugsbakk wrote:
>> On Mon, Oct 14, 2024, at 12:16, Patrick Steinhardt wrote:
>> > […]
>>
>> Thanks.  This makes sense. :)
>>
>> ❦
>>
>> I discovered/re-discovered a pitfall with the following approach:
>>
>>> Create a `refs/heads/<symref>` which points to a remote-tracking
>>> branch
>>
>> Again, so tempting to do for me because you get a shorthand via
>> `refs/heads`.  And this is indeed fine for read-only operations
>> (effectively).
>>
>> But don’t be careless and do something like commit while checked out
>> here.  Because you are checked out on an ostensibly “proper branch” (not
>> detached HEAD) and the remote-tracking branch will move forward with a
>> commit.
>>
>> So I’ve gone back to using one-level (root-level) symrefs with
>> all-capital names.  Because git-symbolic-ref(1) allows that and I
>> haven’t gotten any weird warnings from it.  (I would presumably get
>> warnings if I then defined a ref named e.g. `refs/heads/M` if `M` was my
>> top-level symref.)
>
> Another newbie mistake.
>
> I used e.g. `H` (root level).  But then I was in a worktree and
> discovered that these root-level refs are per worktree.
>
> But this works across worktress:
>
> ```
> git symbolic-ref refs/H HEAD
> ```
>
> (Or `refs/h`)

I’ve been using some shorthands for over half a year now:

```
git symbolic-ref refs/C refs/heads/<longer branch name>
git symbolic-ref refs/O refs/remotes/origin/<longer branch name>
```

E.g. I find the latter convenient for referring to some long-living
branch that is also long-named.  I use the remote-tracking branch
directly to use as the upstream-tracking ref and to rebase on top of.

I haven’t had any problems yet.

-- 
Kristoffer Haugsbakk

      reply	other threads:[~2025-06-20 15:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-13 19:57 What’s the intended/reasonable usage patterns for symrefs? Kristoffer Haugsbakk
2024-10-14 10:16 ` Patrick Steinhardt
2024-10-16 17:23   ` Kristoffer Haugsbakk
2024-11-04 10:45     ` Kristoffer Haugsbakk
2025-06-20 15:29       ` Kristoffer Haugsbakk [this message]

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=74ee41f3-a9dd-4a9a-9350-33ffef7dea23@app.fastmail.com \
    --to=kristofferhaugsbakk@fastmail.com \
    --cc=git@vger.kernel.org \
    --cc=ps@pks.im \
    /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;
as well as URLs for NNTP newsgroup(s).