From cf424f5fd89bb5cd09b24c96633f8951b6fd7b54 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Mar 2014 16:37:30 -0400 Subject: clean: respect pathspecs with "-d" git-clean uses read_directory to fill in a `struct dir` with potential hits. However, read_directory does not actually check against our pathspec. It uses a simplified version that may turn up false positives. As a result, we need to check that any hits match our pathspec. We do so reliably for non-directories. For directories, if "-d" is not given we check that the pathspec matched exactly (i.e., we are even stricter, and require an explicit "git clean foo" to clean "foo/"). But if "-d" is given, rather than relaxing the exact match to allow a recursive match, we do not check the pathspec at all. This regression was introduced in 113f10f (Make git-clean a builtin, 2007-11-11). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/clean.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'builtin/clean.c') diff --git a/builtin/clean.c b/builtin/clean.c index 615cd57caf..857187ef3b 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -964,14 +964,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix) matches = match_pathspec_depth(&pathspec, ent->name, len, 0, NULL); + if (pathspec.nr && !matches) + continue; + 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); } -- cgit v1.2.1 From 1f2e1088871e777355025a84f80a2d8b5cb04c06 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Mar 2014 13:24:47 -0400 Subject: clean: simplify dir/not-dir logic When we get a list of paths from read_directory, we further prune it to create the final list of items to remove. The code paths for directories and non-directories repeat the same "add to list" code. This patch restructures the code so that we don't repeat ourselves. Also, by following a "if (condition) continue" pattern like the pathspec check above, it makes it more obvious that the conditional is about excluding directories under certain circumstances. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/clean.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'builtin/clean.c') diff --git a/builtin/clean.c b/builtin/clean.c index 857187ef3b..4ec4fe2577 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -967,15 +967,12 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (pathspec.nr && !matches) continue; - 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 { - rel = relative_path(ent->name, prefix, &buf); - string_list_append(&del_list, rel); - } + 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) -- cgit v1.2.1