Re: [PATCH v2] name-hash: properly fold directory names in adjust_dirname_case()

[Torsten Bögershausen]

On Thu, Feb 08, 2018 at 02:23:33PM -0500, Ben Peart wrote:

[]

> -
> +test_expect_success CASE_INSENSITIVE_FS 'add directory (with different 
> case)' '
> + git reset --hard initial &&
> + mkdir -p dir1/dir2 &&
> + echo > dir1/dir2/a &&
> + echo > dir1/dir2/b &&

Thanks for working on this-
One and a half style nits:
The ">" should be close to the file name:
echo >dir1/dir2/a &&
But then we don't even look into the file, so that the "\" produced by echo is 
not needed.
A simple 
>dir1/dir2/a &&
is all that is needed.

[PATCH v2] name-hash: properly fold directory names in adjust_dirname_case()

[Ben Peart]

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 
---

Notes:
Base Ref: v2.16.1
Web-Diff: https://github.com/benpeart/git/commit/477da4602c
Checkout: git fetch https://github.com/benpeart/git adjust_dirname-v2 && 
git checkout 477da4602c

### Interdiff (v1..v2):

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 219c96594c..0e4e51b79a 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -82,14 +82,18 @@ 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 &&
-   touch dir1/dir2/a &&
-   touch dir1/dir2/b &&
+   echo > dir1/dir2/a &&
+   echo > dir1/dir2/b &&
git add dir1/dir2/a &&
git add dir1/DIR2/b &&
-   camel=$(git ls-files | grep dir2) &&
-   test $(echo "$camel" | wc -l) = 2
+   git ls-files >actual &&
+   cat >expected <<-\EOF &&
+   camelcase
+   dir1/dir2/a
+   dir1/dir2/b
+   EOF
+   test_cmp expected actual
 '

 test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '

### Patches

 name-hash.c   |  6 +++---
 t/t0050-filesystem.sh | 16 +++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/name-hash.c b/name-hash.c
index 45c98db0a0..2ddbb72647 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -696,12 +696,12 @@ void adjust_dirname_case(struct index_state *istate, char 
*name)
if (*ptr == '/') {
struct dir_entry *dir;
 
-   ptr++;
-   dir = find_dir_entry(istate, name, ptr - name + 1);
+   dir = find_dir_entry(istate, name, ptr - name);
if (dir) {
memcpy((void *)startPtr, dir->name + (startPtr 
- name), ptr - startPtr);
-   startPtr = ptr;
+   startPtr = ptr + 1;
}
+   ptr++;
}
}
 }
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index b29d749bb7..0e4e51b79a 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -80,7 +80,21 @@ test_expect_success 'merge (case change)' '
git merge topic
 '
 
-
+test_expect_success CASE_INSENSITIVE_FS 'add directory (with different case)' '
+   git reset --hard initial &&
+   mkdir -p dir1/dir2 &&
+   echo > dir1/dir2/a &&
+   echo > dir1/dir2/b &&
+   git add dir1/dir2/a &&
+   git add dir1/DIR2/b &&
+   git ls-files >actual &&
+   cat >expected <<-\EOF &&
+   camelcase
+   dir1/dir2/a
+   dir1/dir2/b
+   EOF
+   test_cmp expected actual
+'
 
 test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '
git reset --hard initial &&

base-commit: 8279ed033f703d4115bee620dccd32a9ec94d9aa
-- 
2.15.0.windows.1