git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ben Peart <benpeart@microsoft.com>
Cc: git@vger.kernel.org, prohaska@zib.de, tboegi@web.de,
	sunshine@sunshineco.com, novalis@novalis.org
Subject: Re: [PATCH v1] name-hash: properly fold directory names in adjust_dirname_case()
Date: Thu, 08 Feb 2018 10:20:47 -0800	[thread overview]
Message-ID: <xmqqlgg35on4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180208004156.36224-1-benpeart@microsoft.com> (Ben Peart's message of "Wed, 7 Feb 2018 19:41:56 -0500")

Ben Peart <benpeart@microsoft.com> writes:

> Correct the pointer arithmetic in adjust_dirname_case() so that it calls
> find_dir_entry() with the correct string length.  Previously passing in
> "dir1/foo" would pass a length of 6 instead of the correct 4.  This resulted in
> find_dir_entry() never finding the entry and so the subsequent memcpy that would
> fold the name to the version with the correct case never executed.
>
> Add a test to validate the corrected behavior with name folding of directories.
>
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
> ---

Thanks.

It appears that this codepath has been miscounting ever since it was
introduced in 41284eb0 ("name-hash: don't reuse cache_entry in
dir_entry", 2015-10-21).

> diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
> index b29d749bb7..219c96594c 100755
> --- a/t/t0050-filesystem.sh
> +++ b/t/t0050-filesystem.sh
> @@ -80,7 +80,17 @@ test_expect_success 'merge (case change)' '
> ...
> +test_expect_success CASE_INSENSITIVE_FS 'add directory (with different case)' '
> +	git reset --hard initial &&
> +	mkdir -p dir1 &&
> +	mkdir -p dir1/dir2 &&

A single "mkdir -p dir1/dir2" should be sufficient, thanks to "-p" ;-)

> +	touch dir1/dir2/a &&
> +	touch dir1/dir2/b &&

Hmph.

  parent reply	other threads:[~2018-02-08 18:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-08  0:41 [PATCH v1] name-hash: properly fold directory names in adjust_dirname_case() Ben Peart
2018-02-08  1:02 ` David Turner
2018-02-08 17:21 ` Torsten Bögershausen
2018-02-08 17:45   ` Ben Peart
2018-02-08 18:24   ` Junio C Hamano
2018-02-08 18:20 ` Junio C Hamano [this message]
2018-02-08 19:23 ` [PATCH v2] " Ben Peart
2018-02-09  5:43   ` Torsten Bögershausen

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

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

  git send-email \
    --in-reply-to=xmqqlgg35on4.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=benpeart@microsoft.com \
    --cc=git@vger.kernel.org \
    --cc=novalis@novalis.org \
    --cc=prohaska@zib.de \
    --cc=sunshine@sunshineco.com \
    --cc=tboegi@web.de \
    /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.
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 NNTP newsgroup(s).