From: Junio C Hamano <gitster@pobox.com> To: "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> Cc: git@vger.kernel.org, Han-Wen Nienhuys <hanwenn@gmail.com>, Han-Wen Nienhuys <hanwen@google.com> Subject: Re: [PATCH 2/2] Make HEAD a PSEUDOREF rather than PER_WORKTREE. Date: Mon, 06 Jul 2020 13:30:32 -0700 [thread overview] Message-ID: <xmqqeepo9yjb.fsf@gitster.c.googlers.com> (raw) In-Reply-To: <470821dc6d4b72c6414b3458883277ad36952892.1594056572.git.gitgitgadget@gmail.com> (Han-Wen Nienhuys via GitGitGadget's message of "Mon, 06 Jul 2020 17:29:32 +0000") "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Han-Wen Nienhuys <hanwen@google.com> > > This is consistent with the definition of REF_TYPE_PSEUDOREF > (uppercase in the root ref namespace). I wonder if some special casing we saw for "HEAD" in 1/2 (e.g. we no longer do this to pseudorefs in this codepath but HEAD is different and will continue to be dealt with in the codepath) needs adjustment after this change? HEAD still needs to be able to have a different value (either detached or pointing to another ref) per worktree, but it is unclear where that knowledge now resides in the new code. Are we declaring that all pseudorefs are per worktree (which I think is not wrong)? > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > --- > refs.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/refs.c b/refs.c > index a2fd42364f..265767a234 100644 > --- a/refs.c > +++ b/refs.c > @@ -676,10 +676,9 @@ int dwim_log(const char *str, int len, struct object_id *oid, char **log) > > static int is_per_worktree_ref(const char *refname) > { > - return !strcmp(refname, "HEAD") || > - starts_with(refname, "refs/worktree/") || > - starts_with(refname, "refs/bisect/") || > - starts_with(refname, "refs/rewritten/"); > + return starts_with(refname, "refs/worktree/") || > + starts_with(refname, "refs/bisect/") || > + starts_with(refname, "refs/rewritten/"); > } > > static int is_pseudoref_syntax(const char *refname)
next prev parent reply other threads:[~2020-07-06 20:30 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-06 17:29 [PATCH 0/2] Remove special casing for PSEUDOREF updates Han-Wen Nienhuys via GitGitGadget 2020-07-06 17:29 ` [PATCH 1/2] Modify pseudo refs through ref backend storage Han-Wen Nienhuys via GitGitGadget 2020-07-06 20:26 ` Junio C Hamano 2020-07-07 13:56 ` Han-Wen Nienhuys 2020-07-07 15:20 ` Junio C Hamano 2020-07-07 17:15 ` Han-Wen Nienhuys 2020-07-07 18:14 ` Junio C Hamano 2020-07-06 17:29 ` [PATCH 2/2] Make HEAD a PSEUDOREF rather than PER_WORKTREE Han-Wen Nienhuys via GitGitGadget 2020-07-06 20:30 ` Junio C Hamano [this message] 2020-07-07 9:24 ` Han-Wen Nienhuys 2020-07-09 21:11 ` [PATCH v2 0/3] Remove special casing for PSEUDOREF updates Han-Wen Nienhuys via GitGitGadget 2020-07-09 21:11 ` [PATCH v2 1/3] t1400: use git rev-parse for testing PSEUDOREF existence Han-Wen Nienhuys via GitGitGadget 2020-07-09 21:11 ` [PATCH v2 2/3] Modify pseudo refs through ref backend storage Han-Wen Nienhuys via GitGitGadget 2020-07-09 21:11 ` [PATCH v2 3/3] Make HEAD a PSEUDOREF rather than PER_WORKTREE Han-Wen Nienhuys via GitGitGadget 2020-07-10 19:25 ` [PATCH v2 0/3] Remove special casing for PSEUDOREF updates Junio C Hamano 2020-07-16 18:45 ` [PATCH v3 " Han-Wen Nienhuys via GitGitGadget 2020-07-16 18:45 ` [PATCH v3 1/3] t1400: use git rev-parse for testing PSEUDOREF existence Han-Wen Nienhuys via GitGitGadget 2020-07-16 18:45 ` [PATCH v3 2/3] Modify pseudo refs through ref backend storage Han-Wen Nienhuys via GitGitGadget 2020-07-17 8:52 ` Johannes Schindelin 2020-07-27 15:41 ` Han-Wen Nienhuys 2020-07-16 18:45 ` [PATCH v3 3/3] Make HEAD a PSEUDOREF rather than PER_WORKTREE Han-Wen Nienhuys via GitGitGadget 2020-07-16 22:09 ` [PATCH v3 0/3] Remove special casing for PSEUDOREF updates Junio C Hamano 2020-07-27 8:50 ` Han-Wen Nienhuys 2020-07-27 16:20 ` Junio C Hamano 2020-08-03 19:07 ` Han-Wen Nienhuys 2020-08-03 20:07 ` Junio C Hamano 2020-08-05 1:45 ` Junio C Hamano 2020-08-05 10:48 ` Han-Wen Nienhuys 2020-08-05 15:54 ` Junio C Hamano 2020-08-10 14:27 ` Han-Wen Nienhuys 2020-08-10 16:04 ` Junio C Hamano 2020-08-11 10:49 ` Han-Wen Nienhuys 2020-08-11 18:38 ` Junio C Hamano 2020-08-19 13:19 ` Han-Wen Nienhuys 2020-08-19 15:52 ` Junio C Hamano 2020-07-27 16:25 ` [PATCH v4 " Han-Wen Nienhuys via GitGitGadget 2020-07-27 16:25 ` [PATCH v4 1/3] t1400: use git rev-parse for testing PSEUDOREF existence Han-Wen Nienhuys via GitGitGadget 2020-07-27 16:25 ` [PATCH v4 2/3] Modify pseudo refs through ref backend storage Han-Wen Nienhuys via GitGitGadget 2020-07-27 16:25 ` [PATCH v4 3/3] Make HEAD a PSEUDOREF rather than PER_WORKTREE 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: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=xmqqeepo9yjb.fsf@gitster.c.googlers.com \ --to=gitster@pobox.com \ --cc=git@vger.kernel.org \ --cc=gitgitgadget@gmail.com \ --cc=hanwen@google.com \ --cc=hanwenn@gmail.com \ --subject='Re: [PATCH 2/2] Make HEAD a PSEUDOREF rather than PER_WORKTREE.' \ /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
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git 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).