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

clean: replace match_pathspec() with dir_path_match()

Browse Source 
This instance was left out when many match_pathspec() call sites that
take input from dir_entry were converted to dir_path_match() because
it passed a path with the trailing slash stripped out to match_pathspec()
while the others did not. Stripping for all call sites back then would
be a regression because match_pathspec() did not know how to match
pathspec foo/ against _directory_ foo (the stripped version of path
"foo/").

match_pathspec() knows how to do it now. And dir_path_match() strips
the trailing slash also. Use the new function, because the stripping
code is removed in the next patch.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-01-24 20:40:34 +07:00
committed by Junio C Hamano
parent ae8d082421
commit 05b85022c9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/clean.c
View File

@ -961,8 +961,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
die_errno("Cannot lstat '%s'", ent->name); die_errno("Cannot lstat '%s'", ent->name);
if (pathspec.nr) if (pathspec.nr)
matches = match_pathspec(&pathspec, ent->name, matches = dir_path_match(ent, &pathspec, 0, NULL);
len, 0, NULL, 0);
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
if (remove_directories || (matches == MATCHED_EXACTLY)) { if (remove_directories || (matches == MATCHED_EXACTLY)) {