mirror of https://github.com/git/git.git
match_pathname(): drop unused "flags" parameter
This field has not been used since the function was introduced inb559263216
(exclude: split pathname matching code into a separate function, 2012-10-15), though there was a brief period where it was erroneously used and then reverted ined4958477b
(dir: fix pattern matching on dirs, 2021-09-24) and5ceb663e92
(dir: fix directory-matching bug, 2021-11-02). It's possible we'd eventually add a flag that makes it useful here, but there are only a handful of callers. It would be easy to add back if necessary, and in the meantime this makes the function interface less misleading. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e2841f706e
commit
77651c032c
2
attr.c
2
attr.c
|
@ -1023,7 +1023,7 @@ static int path_matches(const char *pathname, int pathlen,
|
||||||
}
|
}
|
||||||
return match_pathname(pathname, pathlen - isdir,
|
return match_pathname(pathname, pathlen - isdir,
|
||||||
base, baselen,
|
base, baselen,
|
||||||
pattern, prefix, pat->patternlen, pat->flags);
|
pattern, prefix, pat->patternlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem);
|
static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem);
|
||||||
|
|
6
dir.c
6
dir.c
|
@ -1244,8 +1244,7 @@ int match_basename(const char *basename, int basenamelen,
|
||||||
|
|
||||||
int match_pathname(const char *pathname, int pathlen,
|
int match_pathname(const char *pathname, int pathlen,
|
||||||
const char *base, int baselen,
|
const char *base, int baselen,
|
||||||
const char *pattern, int prefix, int patternlen,
|
const char *pattern, int prefix, int patternlen)
|
||||||
unsigned flags)
|
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
int namelen;
|
int namelen;
|
||||||
|
@ -1347,8 +1346,7 @@ static struct path_pattern *last_matching_pattern_from_list(const char *pathname
|
||||||
if (match_pathname(pathname, pathlen,
|
if (match_pathname(pathname, pathlen,
|
||||||
pattern->base,
|
pattern->base,
|
||||||
pattern->baselen ? pattern->baselen - 1 : 0,
|
pattern->baselen ? pattern->baselen - 1 : 0,
|
||||||
exclude, prefix, pattern->patternlen,
|
exclude, prefix, pattern->patternlen)) {
|
||||||
pattern->flags)) {
|
|
||||||
res = pattern;
|
res = pattern;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
2
dir.h
2
dir.h
|
@ -414,7 +414,7 @@ int match_basename(const char *, int,
|
||||||
const char *, int, int, unsigned);
|
const char *, int, int, unsigned);
|
||||||
int match_pathname(const char *, int,
|
int match_pathname(const char *, int,
|
||||||
const char *, int,
|
const char *, int,
|
||||||
const char *, int, int, unsigned);
|
const char *, int, int);
|
||||||
|
|
||||||
struct path_pattern *last_matching_pattern(struct dir_struct *dir,
|
struct path_pattern *last_matching_pattern(struct dir_struct *dir,
|
||||||
struct index_state *istate,
|
struct index_state *istate,
|
||||||
|
|
Loading…
Reference in New Issue