mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: "Han-Wen Nienhuys via GitGitGadget" <>
Cc:, Han-Wen Nienhuys <>,
	Han-Wen Nienhuys <>
Subject: Re: [PATCH] refs: unify parse_worktree_ref() and ref_type()
Date: Mon, 12 Sep 2022 13:13:07 -0700	[thread overview]
Message-ID: <xmqq35cwcpws.fsf@gitster.g> (raw)
In-Reply-To: <xmqq1qsge71x.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 12 Sep 2022 12:17:30 -0700")

Junio C Hamano <> writes:

> Otherwise we fall through with worktree_ref that we have stripped
> main-worktree/ prefix, which means the original input
> 	main-worktree/worktrees/foo/blah
> is now 
> 	worktrees/foo/blah
> and the next skip_prefix() will see that it begins with "worktrees/".
> Of course, if the initial input were
> 	worktrees/foo/blah
> then we wouldn't have skipped main-worktree/ prefix from it, and go
> to the next skip_prefix().  So from here on, we cannot tell which
> case the original input was.
> But that is OK.  Asking "give me the ref 'blah' in the worktree 'foo'"
> in the current worktree should yield the same answer to the question
> "give me the ref 'blah' in the worktree 'foo', as if I asked you to
> do so in the main worktree".

This makes me wonder...

I wonder if it makes the resulting code clearer to go fully
recursive, unlike the posted code that says "if a recursive call
says it is for current, that means it is for main worktree, and
otherwise pretend as if the input did not have the prefix".

That is, something like

parse_worktree_ref(...) {

	... prepare name, name_len and ref ...

	if (skip_prefix(worktree_ref, "main-worktree/", &worktree_ref)) {
		parsed = parse_worktree_ref(worktree_ref, name, name_len, ref);
        	switch (parsed) {
                case REF_WORKTREE_MAIN:
			return parsed;

	if (skip_prefix(worktree_ref, "worktrees/", &worktree_ref)) {
		slash = strchr(worktree_ref, '/');

		parsed = parse_worktree_ref(slash + 1, name, name_len, ref);
        	switch (parsed) {
			return WORKTREE_OTHER; /* iffy */
                case REF_WORKTREE_MAIN:
			return parsed;

	/* Otherwise the input is like HEAD, MERGE_HEAD, refs/$BLAH */
	... do whatever for these trivial cases ...


And while composing this follow-up, I found another thing that is
iffy.  When you ask for "worktrees/foo/refs/bisect/good", the
recursive call in "worktrees/foo" for the remainder says "current",
and the posted patch and the above pseudocode would take CURRENT to
mean "that other worktree's", and turns it into OTHER i.e. "not
ours".  But the code does so without even checking what our worktree
is called.  What happens if we are the owner of the "worktrees/foo"
namespace?  The same thing for "The main worktree says the given ref
is 'current', so we can turn that into 'main'"---if our worktree is
'main', it is also 'current' and does not have to be turned into
'main' (even though it does not hurt).

  reply	other threads:[~2022-09-12 20:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-12 17:01 [PATCH] refs: unify parse_worktree_ref() and ref_type() Han-Wen Nienhuys via GitGitGadget
2022-09-12 19:17 ` Junio C Hamano
2022-09-12 20:13   ` Junio C Hamano [this message]
2022-09-13 15:43     ` Junio C Hamano
2022-09-19 14:28       ` Han-Wen Nienhuys
2022-09-19 21:43         ` Junio C Hamano
2022-09-20  8:53           ` Han-Wen Nienhuys
2022-09-21 16:45             ` Junio C Hamano
2022-09-19 16:34 ` [PATCH v2] " Han-Wen Nienhuys 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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq35cwcpws.fsf@gitster.g \ \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).