summaryrefslogtreecommitdiff
path: root/builtin/clean.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-18 21:04:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-18 21:04:59 (GMT)
commit9526473f110338d23524ea663eb282a36c7fe4f3 (patch)
tree3c453cb4d879678b9998082dc2eb0ca560863b5e /builtin/clean.c
parent01e13d0221e73febdcb98e26b4ae2882887421d8 (diff)
parent1f2e1088871e777355025a84f80a2d8b5cb04c06 (diff)
downloadgit-9526473f110338d23524ea663eb282a36c7fe4f3.zip
git-9526473f110338d23524ea663eb282a36c7fe4f3.tar.gz
git-9526473f110338d23524ea663eb282a36c7fe4f3.tar.bz2
Merge branch 'jk/clean-d-pathspec' into maint
"git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * jk/clean-d-pathspec: clean: simplify dir/not-dir logic clean: respect pathspecs with "-d"
Diffstat (limited to 'builtin/clean.c')
-rw-r--r--builtin/clean.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index cb02a53..5502957 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -946,17 +946,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (pathspec.nr)
matches = dir_path_match(ent, &pathspec, 0, NULL);
- if (S_ISDIR(st.st_mode)) {
- if (remove_directories || (matches == MATCHED_EXACTLY)) {
- rel = relative_path(ent->name, prefix, &buf);
- string_list_append(&del_list, rel);
- }
- } else {
- if (pathspec.nr && !matches)
- continue;
- rel = relative_path(ent->name, prefix, &buf);
- string_list_append(&del_list, rel);
- }
+ if (pathspec.nr && !matches)
+ continue;
+
+ if (S_ISDIR(st.st_mode) && !remove_directories &&
+ matches != MATCHED_EXACTLY)
+ continue;
+
+ rel = relative_path(ent->name, prefix, &buf);
+ string_list_append(&del_list, rel);
}
if (interactive && del_list.nr > 0)