Merge branch 'np/verify-pack' into maint

diff --git a/builtin-clean.c b/builtin-clean.c
index ae30d4e76c3e758689464f41a63dda0605d60e9f..48bf29f40a5e06fd588b34c468535e04abcf206b 100644 (file)
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -10,30 +10,33 @@
 #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 git_default_config(var, value);
+       return git_default_config(var, value, cb);
 }
 
 int cmd_clean(int argc, const char **argv, const char *prefix)
 {
        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),
@@ -47,7 +50,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
-       git_config(git_clean_config);
+       git_config(git_clean_config, NULL);
        if (force < 0)
                force = 0;
        else
@@ -55,6 +58,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 
        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;
@@ -87,11 +91,12 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        strbuf_init(&directory, 0);
 
        if (pathspec)
-               seen = xmalloc(argc);
+               seen = xmalloc(argc > 0 ? argc : 1);
 
        for (i = 0; i < dir.nr; i++) {
                struct dir_entry *ent = dir.entries[i];
-               int len, pos, matches;
+               int len, pos;
+               int matches = 0;
                struct cache_entry *ce;
                struct stat st;
 
@@ -122,42 +127,49 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                        continue;
 
                if (pathspec) {
-                       memset(seen, 0, argc);
-                       matches = match_pathspec(pathspec, ent->name, ent->len,
+                       memset(seen, 0, argc > 0 ? argc : 1);
+                       matches = match_pathspec(pathspec, ent->name, len,
                                                 baselen, seen);
-               } else {
-                       matches = 0;
                }
 
                if (S_ISDIR(st.st_mode)) {
                        strbuf_addstr(&directory, ent->name);
-                       if (show_only && (remove_directories || matches)) {
-                               printf("Would remove %s\n", directory.buf);
-                       } else if (quiet && (remove_directories || matches)) {
-                               remove_dir_recursively(&directory, 0);
-                       } else if (remove_directories || matches) {
-                               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);
 }