mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
cf424f5fd8
commit
1f2e108887
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue