#include "cache.h"
#include "dir.h"
#include "parse-options.h"
+#include "quote.h"
static int force = -1; /* unset */
static const char *const builtin_clean_usage[] = {
- "git
-clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...",
+ "git
clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...",
NULL
};
-static int git_clean_config(const char *var, const char *value)
+static int git_clean_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "clean.requireforce"))
force = !git_config_bool(var, value);
- return 0;
+ return git_default_config(var, value, cb);
}
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, config_set = 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;
+ struct strbuf buf;
+ const char *qname;
+ char *seen = NULL;
struct option options[] = {
OPT__QUIET(&quiet),
OPT__DRY_RUN(&show_only),
OPT_END()
};
- git_config(git_clean_config);
+ git_config(git_clean_config, NULL);
if (force < 0)
force = 0;
else
argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
+ strbuf_init(&buf, 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");
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);
pathspec = get_pathspec(prefix, argv);
read_cache();
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;
+ int matches = 0;
struct cache_entry *ce;
struct stat st;
- char *seen;
/*
* Remove the '/' at the end that directory
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, len,
+ baselen, seen);
+ }
+
+ 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);
+ qname = quote_path_relative(directory.buf, directory.len, &buf, prefix);
+ if (show_only && (remove_directories ||
+ (matches == MATCHED_EXACTLY))) {
+ printf("Would remove %s\n", qname);
+ } else if (remove_directories ||
+ (matches == MATCHED_EXACTLY)) {
+ if (!quiet)
+ printf("Removing %s\n", qname);
+ if (remove_dir_recursively(&directory, 0) != 0) {
+ warning("failed to remove '%s'", qname);
+ errors++;
+ }
} else if (show_only) {
- printf("Would not remove %s\n", directory.buf);
+ printf("Would not remove %s\n", qname);
} else {
- printf("Not removing %s\n", directory.buf);
+ printf("Not removing %s\n", qname);
}
strbuf_reset(&directory);
} else {
+ if (pathspec && !matches)
+ continue;
+ qname = quote_path_relative(ent->name, -1, &buf, prefix);
if (show_only) {
- printf("Would remove %s\n", ent->name);
+ printf("Would remove %s\n", qname);
continue;
} else if (!quiet) {
- printf("Removing %s\n", ent->name);
+ printf("Removing %s\n", qname);
+ }
+ if (unlink(ent->name) != 0) {
+ warning("failed to remove '%s'", qname);
+ errors++;
}
- unlink(ent->name);
}
}
+ free(seen);
strbuf_release(&directory);
- return 0;
+ return (errors != 0);
}