proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 12:57:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

attr_file: fix subdirectory attr case.

Browse Source 
Closes #2966.
This commit is contained in:
Mike McQuaid 2015-04-17 18:27:28 -07:00 committed by Carlos Martín Nieto
parent c6bf03b44f
commit c02a0e46eb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/attr_file.c
View File

@ -394,6 +394,7 @@ bool git_attr_fnmatch__match(
if ((match->flags & GIT_ATTR_FNMATCH_DIRECTORY) && !path->is_dir) { if ((match->flags & GIT_ATTR_FNMATCH_DIRECTORY) && !path->is_dir) {
int matchval; int matchval;
char *matchpath;
/* for attribute checks or root ignore checks, fail match */ /* for attribute checks or root ignore checks, fail match */
if (!(match->flags & GIT_ATTR_FNMATCH_IGNORE) || if (!(match->flags & GIT_ATTR_FNMATCH_IGNORE) ||
@ -403,7 +404,13 @@ bool git_attr_fnmatch__match(
/* for ignore checks, use container of current item for check */ /* for ignore checks, use container of current item for check */
path->basename[-1] = '\0'; path->basename[-1] = '\0';
flags |= FNM_LEADING_DIR; flags |= FNM_LEADING_DIR;
matchval = p_fnmatch(match->pattern, path->path, flags);
if (match->containing_dir)
matchpath = path->basename;
else
matchpath = path->path;
matchval = p_fnmatch(match->pattern, matchpath, flags);
path->basename[-1] = '/'; path->basename[-1] = '/';
return (matchval != FNM_NOMATCH); return (matchval != FNM_NOMATCH);
} }