mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-29 14:26:11 +02:00
Code

Merge branch 'ds/add-rm-with-sparse-index' 

Regression fix.

* ds/add-rm-with-sparse-index:
  dir: fix directory-matching bug
This commit is contained in:
Junio C Hamano 2021-11-03 13:32:28 -07:00
parent e2a33ef9e2 5ceb663e92
commit 36f0a2e20f
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dir.c
View File

@ -1294,7 +1294,7 @@ int match_pathname(const char *pathname, int pathlen,
* then our prefix match is all we need; we
* do not need to call fnmatch at all.
*/
if (!patternlen && (!namelen || (flags & PATTERN_FLAG_MUSTBEDIR)))
if (!patternlen && !namelen)
return 1;
}

26
t/t0008-ignores.sh
View File

@ -803,6 +803,32 @@ test_expect_success 'existing directory and file' '
grep top-level-dir actual
'
test_expect_success 'exact prefix matching (with root)' '
test_when_finished rm -r a &&
mkdir -p a/git a/git-foo &&
touch a/git/foo a/git-foo/bar &&
echo /git/ >a/.gitignore &&
git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
cat >expect <<-\EOF &&
a/git
a/git/foo
EOF
test_cmp expect actual
'
test_expect_success 'exact prefix matching (without root)' '
test_when_finished rm -r a &&
mkdir -p a/git a/git-foo &&
touch a/git/foo a/git-foo/bar &&
echo git/ >a/.gitignore &&
git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
cat >expect <<-\EOF &&
a/git
a/git/foo
EOF
test_cmp expect actual
'
############################################################################
#
# test whitespace handling