X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-clean.c;h=3b220d5060b90318e2d2331d3cd0f5b6a70164ee;hb=5348337a3406a28a2db35fdfba8cb766b0241949;hp=55658e742fb0b8d23b9aa140c1d9cabeddd4b3d9;hpb=113f10f22f4b3b599e44e192e241e0bace9cc39e;p=git.git

diff --git a/builtin-clean.c b/builtin-clean.c
index 55658e742..3b220d506 100644
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -11,7 +11,7 @@
 #include "dir.h"
 #include "parse-options.h"
 
-static int force;
+static int force = -1; /* unset */
 
 static const char *const builtin_clean_usage[] = {
 	"git-clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...",
@@ -22,18 +22,20 @@ static int git_clean_config(const char *var, const char *value)
 {
 	if (!strcmp(var, "clean.requireforce"))
 		force = !git_config_bool(var, value);
-	return 0;
+	return git_default_config(var, value);
 }
 
 int cmd_clean(int argc, const char **argv, const char *prefix)
 {
-	int j;
+	int i;
 	int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0;
-	int ignored_only = 0, baselen = 0;
+	int ignored_only = 0, baselen = 0, config_set = 0, errors = 0;
 	struct strbuf directory;
 	struct dir_struct dir;
 	const char *path, *base;
 	static const char **pathspec;
+	int prefix_offset = 0;
+	char *seen = NULL;
 	struct option options[] = {
 		OPT__QUIET(&quiet),
 		OPT__DRY_RUN(&show_only),
@@ -47,30 +49,31 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	};
 
 	git_config(git_clean_config);
+	if (force < 0)
+		force = 0;
+	else
+		config_set = 1;
+
 	argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
 
 	memset(&dir, 0, sizeof(dir));
-	if (ignored_only) {
-		dir.show_ignored =1;
-		dir.exclude_per_dir = ".gitignore";
-	}
+	if (ignored_only)
+		dir.show_ignored = 1;
 
 	if (ignored && ignored_only)
 		die("-x and -X cannot be used together");
 
 	if (!show_only && !force)
-		die("clean.requireForce set and -n or -f not given; refusing to clean");
+		die("clean.requireForce%s set and -n or -f not given; "
+		    "refusing to clean", config_set ? "" : " not");
 
 	dir.show_other_directories = 1;
 
-	if (!ignored) {
-		dir.exclude_per_dir = ".gitignore";
-		if (!access(git_path("info/exclude"), F_OK)) {
-			char *exclude_path = git_path("info/exclude");
-			add_excludes_from_file(&dir, exclude_path);
-		}
-	}
+	if (!ignored)
+		setup_standard_excludes(&dir);
 
+	if (prefix)
+		prefix_offset = strlen(prefix);
 	pathspec = get_pathspec(prefix, argv);
 	read_cache();
 
@@ -86,12 +89,14 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	read_directory(&dir, path, base, baselen, pathspec);
 	strbuf_init(&directory, 0);
 
-	for (j = 0; j < dir.nr; ++j) {
-		struct dir_entry *ent = dir.entries[j];
-		int len, pos, specs;
+	if (pathspec)
+		seen = xmalloc(argc > 0 ? argc : 1);
+
+	for (i = 0; i < dir.nr; i++) {
+		struct dir_entry *ent = dir.entries[i];
+		int len, pos, matches;
 		struct cache_entry *ce;
 		struct stat st;
-		char *seen;
 
 		/*
 		 * Remove the '/' at the end that directory
@@ -111,44 +116,63 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 				continue; /* Yup, this one exists unmerged */
 		}
 
-		if (!lstat(ent->name, &st) && (S_ISDIR(st.st_mode))) {
-			int matched_path = 0;
+		/*
+		 * we might have removed this as part of earlier
+		 * recursive directory removal, so lstat() here could
+		 * fail with ENOENT.
+		 */
+		if (lstat(ent->name, &st))
+			continue;
+
+		if (pathspec) {
+			memset(seen, 0, argc > 0 ? argc : 1);
+			matches = match_pathspec(pathspec, ent->name, ent->len,
+						 baselen, seen);
+		} else {
+			matches = 0;
+		}
+
+		if (S_ISDIR(st.st_mode)) {
 			strbuf_addstr(&directory, ent->name);
-			if (pathspec) {
-				for (specs =0; pathspec[specs]; ++specs)
-					/* nothing */;
-				seen = xcalloc(specs, 1);
-				/* Check if directory was explictly passed as
-				 * pathspec.  If so we want to remove it */
-				if (match_pathspec(pathspec, ent->name, ent->len,
-						   baselen, seen))
-					matched_path = 1;
-				free(seen);
-			}
-			if (show_only && (remove_directories || matched_path)) {
-				printf("Would remove %s\n", directory.buf);
-			} else if (quiet && (remove_directories || matched_path)) {
-				remove_dir_recursively(&directory, 0);
-			} else if (remove_directories || matched_path) {
-				printf("Removing %s\n", directory.buf);
-				remove_dir_recursively(&directory, 0);
+			if (show_only && (remove_directories || matches)) {
+				printf("Would remove %s\n",
+				       directory.buf + prefix_offset);
+			} else if (remove_directories || matches) {
+				if (!quiet)
+					printf("Removing %s\n",
+					       directory.buf + prefix_offset);
+				if (remove_dir_recursively(&directory, 0) != 0) {
+					warning("failed to remove '%s'",
+						directory.buf + prefix_offset);
+					errors++;
+				}
 			} else if (show_only) {
-				printf("Would not remove %s\n", directory.buf);
+				printf("Would not remove %s\n",
+				       directory.buf + prefix_offset);
 			} else {
-				printf("Not removing %s\n", directory.buf);
+				printf("Not removing %s\n",
+				       directory.buf + prefix_offset);
 			}
 			strbuf_reset(&directory);
 		} else {
+			if (pathspec && !matches)
+				continue;
 			if (show_only) {
-				printf("Would remove %s\n", ent->name);
+				printf("Would remove %s\n",
+				       ent->name + prefix_offset);
 				continue;
 			} else if (!quiet) {
-				printf("Removing %s\n", ent->name);
+				printf("Removing %s\n",
+				       ent->name + prefix_offset);
+			}
+			if (unlink(ent->name) != 0) {
+				warning("failed to remove '%s'", ent->name);
+				errors++;
 			}
-			unlink(ent->name);
 		}
 	}
+	free(seen);
 
 	strbuf_release(&directory);
-	return 0;
+	return (errors != 0);
 }