mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/exclusion-regression-fix'

Browse Source 
The ignore mechanism saw a few regressions around untracked file
listing and sparse checkout selection areas in 2.7.0; the change
that is responsible for the regression has been reverted.

* nd/exclusion-regression-fix:
  Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"
This commit is contained in:
Junio C Hamano
2016-01-20 11:43:33 -08:00
parent ceef512e79 8c722360d1
commit 76b620d816
3 changed files with 5 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
dir.c
View File

@ -880,25 +880,6 @@ int match_pathname(const char *pathname, int pathlen,
*/
if (!patternlen && !namelen)
return 1;
/*
* This can happen when we ignore some exclude rules
* on directories in other to see if negative rules
* may match. E.g.
*
* /abc
* !/abc/def/ghi
*
* The pattern of interest is "/abc". On the first
* try, we should match path "abc" with this pattern
* in the "if" statement right above, but the caller
* ignores it.
*
* On the second try with paths within "abc",
* e.g. "abc/xyz", we come here and try to match it
* with "/abc".
*/
if (!patternlen && namelen && *name == '/')
return 1;
}
return fnmatch_icase_mem(pattern, patternlen,
@ -906,48 +887,6 @@ int match_pathname(const char *pathname, int pathlen,
WM_PATHNAME) == 0;
}
/*
* Return non-zero if pathname is a directory and an ancestor of the
* literal path in a (negative) pattern. This is used to keep
* descending in "foo" and "foo/bar" when the pattern is
* "!foo/bar/.gitignore". "foo/notbar" will not be descended however.
*/
static int match_neg_path(const char *pathname, int pathlen, int *dtype,
const char *base, int baselen,
const char *pattern, int prefix, int patternlen,
int flags)
{
assert((flags & EXC_FLAG_NEGATIVE) && !(flags & EXC_FLAG_NODIR));
if (*dtype == DT_UNKNOWN)
*dtype = get_dtype(NULL, pathname, pathlen);
if (*dtype != DT_DIR)
return 0;
if (*pattern == '/') {
pattern++;
patternlen--;
prefix--;
}
if (baselen) {
if (((pathlen < baselen && base[pathlen] == '/') ||
pathlen == baselen) &&
!strncmp_icase(pathname, base, pathlen))
return 1;
pathname += baselen + 1;
pathlen -= baselen + 1;
}
if (prefix &&
((pathlen < prefix && pattern[pathlen] == '/') &&
!strncmp_icase(pathname, pattern, pathlen)))
return 1;
return 0;
}
/*
* 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
@ -961,7 +900,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
struct exclude_list *el)
{
struct exclude *exc = NULL; /* undecided */
int i, matched_negative_path = 0;
int i;
if (!el->nr)
return NULL; /* undefined */
@ -996,18 +935,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
exc = x;
break;
}
if ((x->flags & EXC_FLAG_NEGATIVE) && !matched_negative_path &&
match_neg_path(pathname, pathlen, dtype, x->base,
x->baselen ? x->baselen - 1 : 0,
exclude, prefix, x->patternlen, x->flags))
matched_negative_path = 1;
}
if (exc &&
!(exc->flags & EXC_FLAG_NEGATIVE) &&
!(exc->flags & EXC_FLAG_NODIR) &&
matched_negative_path)
exc = NULL;
return exc;
}