From: Jeff King <peff@peff.net>
Date: Mon, 10 Mar 2014 17:24:47 +0000 (-0400)
Subject: clean: simplify dir/not-dir logic
X-Git-Tag: v1.9.1~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f2e1088871e777355025a84f80a2d8b5cb04c06;p=thirdparty%2Fgit.git

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>
---

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)