From: Duy Nguyen <pclouds@gmail.com>
To: gitgitgadget@gmail.com
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Mike Rappazzo <rappazzo@gmail.com>
Subject: Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'
Date: Thu, 13 Dec 2018 21:23:17 +0100 [thread overview]
Message-ID: <CACsJy8AsRT+k4kdwC3gGjDOPiDn-L0GJs7-SQHb88Ra_gt4OcA@mail.gmail.com> (raw)
In-Reply-To: <13ee60e44f91ca06d182ff50fa4c69e137650fd2.1544730848.git.gitgitgadget@gmail.com>
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.
> warning(_("ignoring dangling symref %s"), fullref.buf);
> } else if ((flag & REF_ISBROKEN) && strchr(fullref.buf, '/')) {
> warning(_("ignoring broken ref %s"), fullref.buf);
--
Duy
next prev parent reply other threads:[~2018-12-13 20:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 19:54 [PATCH 0/1] worktree refs: fix case sensitivity for 'head' Michael Rappazzo via GitGitGadget
2018-12-13 19:54 ` [PATCH 1/1] " Michael Rappazzo via GitGitGadget
2018-12-13 20:23 ` Duy Nguyen [this message]
2018-12-13 20:34 ` Mike Rappazzo
2018-12-13 20:43 ` Duy Nguyen
2018-12-13 20:47 ` Stefan Beller
2018-12-13 21:14 ` Mike Rappazzo
2018-12-14 0:33 ` brian m. carlson
2018-12-14 6:49 ` Jacob Keller
2018-12-14 7:37 ` Duy Nguyen
2018-12-14 17:22 ` Jacob Keller
2018-12-14 17:38 ` Duy Nguyen
2018-12-14 17:46 ` Duy Nguyen
2018-12-14 18:48 ` Jacob Keller
2018-12-14 18:47 ` Jacob Keller
2018-12-13 21:07 ` Mike Rappazzo
2018-12-14 3:31 ` Junio C Hamano
2018-12-14 10:36 ` [PATCH 0/1] " Johannes Schindelin
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=CACsJy8AsRT+k4kdwC3gGjDOPiDn-L0GJs7-SQHb88Ra_gt4OcA@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=rappazzo@gmail.com \
/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.
Code repositories for project(s) associated with this public 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).