summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-03-10 17:24:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-11 19:14:25 (GMT)
commit1f2e1088871e777355025a84f80a2d8b5cb04c06 (patch)
tree05124a700bc80d9d4a33232075383934e2368a1b /builtin
parentcf424f5fd89bb5cd09b24c96633f8951b6fd7b54 (diff)
downloadgit-1f2e1088871e777355025a84f80a2d8b5cb04c06.zip
git-1f2e1088871e777355025a84f80a2d8b5cb04c06.tar.gz
git-1f2e1088871e777355025a84f80a2d8b5cb04c06.tar.bz2
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/clean.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index 857187e..4ec4fe2 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)