Browse Source

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

"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
maint
Junio C Hamano 10 years ago
parent
commit
6b2c0ead06
  1. 6
      builtin/clean.c

6
builtin/clean.c

@ -941,15 +941,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix) @@ -941,15 +941,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (!cache_name_is_other(ent->name, ent->len))
continue;

if (lstat(ent->name, &st))
die_errno("Cannot lstat '%s'", ent->name);

if (pathspec.nr)
matches = dir_path_match(ent, &pathspec, 0, NULL);

if (pathspec.nr && !matches)
continue;

if (lstat(ent->name, &st))
die_errno("Cannot lstat '%s'", ent->name);

if (S_ISDIR(st.st_mode) && !remove_directories &&
matches != MATCHED_EXACTLY)
continue;

Loading…
Cancel
Save