Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'
- From
Mike Rappazzo <rappazzo@gmail.com>
- Date
- Dec 13, 2018, 20:34 UTC
- Message-ID
- <CANoM8SVMYBRg-nL4r=JJDFU_qZ=grzSmRs-B2nLYUnv5kFc00Q@mail.gmail.com>
- In-Reply-To
- <CACsJy8AsRT+k4kdwC3gGjDOPiDn-L0GJs7-SQHb88Ra_gt4OcA@mail.gmail.com>
On Thu, Dec 13, 2018 at 3:23 PM Duy Nguyen <pclouds@gmail.com> wrote:
Show 30 quoted lines
>
> On Thu, Dec 13, 2018 at 8:56 PM Michael Rappazzo via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> >
> > From: Michael Rappazzo <rappazzo@gmail.com>
> >
> > On a worktree which is not the primary, using the symbolic-ref 'head' was
> > incorrectly pointing to the main worktree's HEAD. The same was true for
> > any other case of the word 'Head'.
> >
> > Signed-off-by: Michael Rappazzo <rappazzo@gmail.com>
> > ---
> > refs.c | 8 ++++----
> > t/t1415-worktree-refs.sh | 9 +++++++++
> > 2 files changed, 13 insertions(+), 4 deletions(-)
> >
> > diff --git a/refs.c b/refs.c
> > index f9936355cd..963e786458 100644
> > --- a/refs.c
> > +++ b/refs.c
> > @@ -579,7 +579,7 @@ int expand_ref(const char *str, int len, struct object_id *oid, char **ref)
> > *ref = xstrdup(r);
> > if (!warn_ambiguous_refs)
> > break;
> > - } else if ((flag & REF_ISSYMREF) && strcmp(fullref.buf, "HEAD")) {
> > + } else if ((flag & REF_ISSYMREF) && strcasecmp(fullref.buf, "HEAD")) {
>
> This is not going to work. How about ~40 other "strcmp.*HEAD"
> instances? All refs are case-sensitive and this probably will not
> change even when we introduce new ref backends.The current situation is definitely a problem. If I am in a worktree, using "head" should be the same as "HEAD".
I am not sure if you mean that the fix is too narrow or too wide. Maybe it is only necessary in 'is_per_worktree_ref'. On the other side of the coin, I could change every strcmp to strcasecmp where the comparison is against "HEAD".
Show 6 quoted lines
>
> > warning(_("ignoring dangling symref %s"), fullref.buf);
> > } else if ((flag & REF_ISBROKEN) && strchr(fullref.buf, '/')) {
> > warning(_("ignoring broken ref %s"), fullref.buf);
> --
> Duy