Revert "unpack-objects: prevent writing of inconsistent objects"

[git.git] / builtin-clean.c

diff --git a/builtin-clean.c b/builtin-clean.c
index ae30d4e76c3e758689464f41a63dda0605d60e9f..3b220d5060b90318e2d2331d3cd0f5b6a70164ee 100644 (file)
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -29,11 +29,12 @@ 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;
+       int prefix_offset = 0;
        char *seen = NULL;
        struct option options[] = {
                OPT__QUIET(&quiet),
@@ -71,6 +72,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        if (!ignored)
                setup_standard_excludes(&dir);
 
+       if (prefix)
+               prefix_offset = strlen(prefix);
        pathspec = get_pathspec(prefix, argv);
        read_cache();
 
@@ -87,7 +90,7 @@ 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];
@@ -122,7 +125,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                        continue;
 
                if (pathspec) {
-                       memset(seen, 0, argc);
+                       memset(seen, 0, argc > 0 ? argc : 1);
                        matches = match_pathspec(pathspec, ent->name, ent->len,
                                                 baselen, seen);
                } else {
@@ -132,32 +135,44 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                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);
+                               printf("Would remove %s\n",
+                                      directory.buf + prefix_offset);
                        } else if (remove_directories || matches) {
-                               printf("Removing %s\n", directory.buf);
-                               remove_dir_recursively(&directory, 0);
+                               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);
 }