undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Regression fix for 2.34

* ds/add-rm-with-sparse-index:
  dir: revert "dir: select directories correctly"
This commit is contained in:
Junio C Hamano 2021-11-22 18:40:10 -08:00
commit 1bf2673685
2 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dir.c
View File

@ -1303,44 +1303,6 @@ int match_pathname(const char *pathname, int pathlen,
WM_PATHNAME) == 0; WM_PATHNAME) == 0;
} }
static int path_matches_dir_pattern(const char *pathname,
int pathlen,
struct strbuf **path_parent,
int *dtype,
struct path_pattern *pattern,
struct index_state *istate)
{
if (!*path_parent) {
char *slash;
CALLOC_ARRAY(*path_parent, 1);
strbuf_add(*path_parent, pathname, pathlen);
slash = find_last_dir_sep((*path_parent)->buf);
if (slash)
strbuf_setlen(*path_parent, slash - (*path_parent)->buf);
else
strbuf_setlen(*path_parent, 0);
}
/*
* If the parent directory matches the pattern, then we do not
* need to check for dtype.
*/
if ((*path_parent)->len &&
match_pathname((*path_parent)->buf, (*path_parent)->len,
pattern->base,
pattern->baselen ? pattern->baselen - 1 : 0,
pattern->pattern, pattern->nowildcardlen,
pattern->patternlen, pattern->flags))
return 1;
*dtype = resolve_dtype(*dtype, istate, pathname, pathlen);
if (*dtype != DT_DIR)
return 0;
return 1;
}
/* /*
* Scan the given exclude list in reverse to see whether pathname * Scan the given exclude list in reverse to see whether pathname
* should be ignored. The first match (i.e. the last on the list), if * should be ignored. The first match (i.e. the last on the list), if
@ -1356,7 +1318,6 @@ static struct path_pattern *last_matching_pattern_from_list(const char *pathname
{ {
struct path_pattern *res = NULL; /* undecided */ struct path_pattern *res = NULL; /* undecided */
int i; int i;
struct strbuf *path_parent = NULL;
if (!pl->nr) if (!pl->nr)
return NULL; /* undefined */ return NULL; /* undefined */
@ -1366,10 +1327,11 @@ static struct path_pattern *last_matching_pattern_from_list(const char *pathname
const char *exclude = pattern->pattern; const char *exclude = pattern->pattern;
int prefix = pattern->nowildcardlen; int prefix = pattern->nowildcardlen;
if (pattern->flags & PATTERN_FLAG_MUSTBEDIR && if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) {
!path_matches_dir_pattern(pathname, pathlen, &path_parent, *dtype = resolve_dtype(*dtype, istate, pathname, pathlen);
dtype, pattern, istate)) if (*dtype != DT_DIR)
continue; continue;
}
if (pattern->flags & PATTERN_FLAG_NODIR) { if (pattern->flags & PATTERN_FLAG_NODIR) {
if (match_basename(basename, if (match_basename(basename,
@ -1393,12 +1355,6 @@ static struct path_pattern *last_matching_pattern_from_list(const char *pathname
break; break;
} }
} }
if (path_parent) {
strbuf_release(path_parent);
free(path_parent);
}
return res; return res;
} }

17
t/t0008-ignores.sh
View File

@ -829,6 +829,23 @@ test_expect_success 'exact prefix matching (without root)' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'directories and ** matches' '
cat >.gitignore <<-\EOF &&
data/**
!data/**/
!data/**/*.txt
EOF
git check-ignore file \
data/file data/data1/file1 data/data1/file1.txt \
data/data2/file2 data/data2/file2.txt >actual &&
cat >expect <<-\EOF &&
data/file
data/data1/file1
data/data2/file2
EOF
test_cmp expect actual
'
############################################################################ ############################################################################
# #
# test whitespace handling # test whitespace handling