Nguyễn Thái Ngọc Duy <[email protected]> writes:
> The main worktree has to be treated specially because well.. it's
> special from the beginning. So HEAD from the main worktree is
> acccessible via the name "main/HEAD" (we can't use
> "worktrees/main/HEAD" because "main" under "worktrees" is not
> reserved).
I do not quite follow. So with this, both refs/heads/master and
main/refs/heads/master are good names for the master branch (even
though the local branch names are not per worktree), because
in the main worktree, refs/bisect/bad and main/refs/bisect/bad ought
to mean the same thing.
side note: Or is this only for pseudo-refs
(i.e. $GIT_DIR/$name where $name consists of all caps or
underscore and typically ends with HEAD)? Even if that were
the case, I do not think it essentially changes the issue
around disambiguation that much.
The disambiguation rule has always been: if you have a confusingly
named ref, you can spell it out fully to avoid any ambiguity, e.g.
refs/heads/refs/heads/foo can be given to "git rev-parse" and will
mean the tip of the branch whose name is "refs/heads/foo", even when
another branch whose name is "foo" exists.
Would we have a reasonable disambiguation rules that work well with
the main/ and worktrees/* prefixes? When somebody has main/HEAD branch
and writes "git rev-parse main/HEAD", does it find refs/heads/main/HEAD
or $GIT_DIR/HEAD, if the user is in the main worktree?
It could be simply that the design is underdocumented in this patch
set (in which case I would have appreciated 'RFC' near 'PATCH'), but
I have a feeling that the code came way too early before such design
issues are fleshed out.
> diff --git a/refs.h b/refs.h
> index bd52c1bbae..9b53dbeae8 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -704,9 +704,11 @@ int parse_hide_refs_config(const char *var, const char
> *value, const char *);
> int ref_is_hidden(const char *, const char *);
>
> enum ref_type {
> - REF_TYPE_PER_WORKTREE,
> - REF_TYPE_PSEUDOREF,
> - REF_TYPE_NORMAL,
> + REF_TYPE_PER_WORKTREE, /* refs inside refs/ but not shared */
> + REF_TYPE_PSEUDOREF, /* refs outside refs/ in current worktree */
> + REF_TYPE_MAIN_PSEUDOREF, /* pseudo refs from the main worktree */
> + REF_TYPE_OTHER_PSEUDOREF, /* pseudo refs from other worktrees */
> + REF_TYPE_NORMAL, /* normal/shared refs inside refs/ */
> };
>
> enum ref_type ref_type(const char *refname);
> diff --git a/refs/files-backend.c b/refs/files-backend.c
> index 416eafa453..bf9ed633b1 100644
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -149,6 +149,23 @@ static struct files_ref_store *files_downcast(struct
> ref_store *ref_store,
> return refs;
> }
>
> +static void files_reflog_path_other_worktrees(struct files_ref_store *refs,
> + struct strbuf *sb,
> + const char *refname)
> +{
> + const char *real_ref;
> +
> + if (!skip_prefix(refname, "worktrees/", &real_ref))
> + BUG("refname %s is not a other-worktree ref", refname);
> + real_ref = strchr(real_ref, '/');
> + if (!real_ref)
> + BUG("refname %s is not a other-worktree ref", refname);
> + real_ref++;
> +
> + strbuf_addf(sb, "%s/%.*slogs/%s", refs->gitcommondir,
> + (int)(real_ref - refname), refname, real_ref);
> +}
> +
> static void files_reflog_path(struct files_ref_store *refs,
> struct strbuf *sb,
> const char *refname)
> @@ -158,6 +175,12 @@ static void files_reflog_path(struct files_ref_store
> *refs,
> case REF_TYPE_PSEUDOREF:
> strbuf_addf(sb, "%s/logs/%s", refs->gitdir, refname);
> break;
> + case REF_TYPE_OTHER_PSEUDOREF:
> + return files_reflog_path_other_worktrees(refs, sb, refname);
> + case REF_TYPE_MAIN_PSEUDOREF:
> + if (!skip_prefix(refname, "main/", &refname))
> + BUG("ref %s is not a main pseudoref", refname);
> + /* passthru */
> case REF_TYPE_NORMAL:
> strbuf_addf(sb, "%s/logs/%s", refs->gitcommondir, refname);
> break;
> @@ -176,6 +199,11 @@ static void files_ref_path(struct files_ref_store *refs,
> case REF_TYPE_PSEUDOREF:
> strbuf_addf(sb, "%s/%s", refs->gitdir, refname);
> break;
> + case REF_TYPE_MAIN_PSEUDOREF:
> + if (!skip_prefix(refname, "main/", &refname))
> + BUG("ref %s is not a main pseudoref", refname);
> + /* passthru */
> + case REF_TYPE_OTHER_PSEUDOREF:
> case REF_TYPE_NORMAL:
> strbuf_addf(sb, "%s/%s", refs->gitcommondir, refname);
> break;
> diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
> index 0c2d5f89a9..46ca7bfc19 100755
> --- a/t/t1415-worktree-refs.sh
> +++ b/t/t1415-worktree-refs.sh
> @@ -33,4 +33,34 @@ test_expect_success 'refs/local are per-worktree' '
> ( cd wt2 && test_cmp_rev local/foo wt2 )
> '
>
> +test_expect_success 'resolve main/HEAD' '
> + test_cmp_rev main/HEAD initial &&
> + ( cd wt1 && test_cmp_rev main/HEAD initial ) &&
> + ( cd wt2 && test_cmp_rev main/HEAD initial )
> +'
> +
> +test_expect_success 'resolve worktrees/xx/HEAD' '
> + test_cmp_rev worktrees/wt1/HEAD wt1 &&
> + ( cd wt1 && test_cmp_rev worktrees/wt1/HEAD wt1 ) &&
> + ( cd wt2 && test_cmp_rev worktrees/wt1/HEAD wt1 )
> +'
> +
> +test_expect_success 'reflog of main/HEAD' '
> + git reflog HEAD | sed "s/HEAD/main\/HEAD/" >expected &&
> + git reflog main/HEAD >actual &&
> + test_cmp expected actual &&
> + git -C wt1 reflog main/HEAD >actual.wt1 &&
> + test_cmp expected actual.wt1
> +'
> +
> +test_expect_success 'reflog of worktrees/xx/HEAD' '
> + git -C wt2 reflog HEAD | sed "s/HEAD/worktrees\/wt2\/HEAD/" >expected &&
> + git reflog worktrees/wt2/HEAD >actual &&
> + test_cmp expected actual &&
> + git -C wt1 reflog worktrees/wt2/HEAD >actual.wt1 &&
> + test_cmp expected actual.wt1 &&
> + git -C wt2 reflog worktrees/wt2/HEAD >actual.wt2 &&
> + test_cmp expected actual.wt2
> +'
> +
> test_done
