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

Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint

Browse Source 
"git clean pathspec..." tried to lstat(2) and complain even for
paths outside the given pathspec.

* dt/clean-pathspec-filter-then-lstat:
  clean: only lstat files in pathspec
This commit is contained in:
Junio C Hamano
2015-06-16 14:33:46 -07:00
parent b76b4cd4f1 838d6a928f
commit 6b2c0ead06
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/clean.c
View File

@ -941,15 +941,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (!cache_name_is_other(ent->name, ent->len)) if (!cache_name_is_other(ent->name, ent->len))
continue; continue;
if (lstat(ent->name, &st))
die_errno("Cannot lstat '%s'", ent->name);
if (pathspec.nr) if (pathspec.nr)
matches = dir_path_match(ent, &pathspec, 0, NULL); matches = dir_path_match(ent, &pathspec, 0, NULL);
if (pathspec.nr && !matches) if (pathspec.nr && !matches)
continue; continue;
if (lstat(ent->name, &st))
die_errno("Cannot lstat '%s'", ent->name);
if (S_ISDIR(st.st_mode) && !remove_directories && if (S_ISDIR(st.st_mode) && !remove_directories &&
matches != MATCHED_EXACTLY) matches != MATCHED_EXACTLY)
continue; continue;