Add a config option to ignore errors for git-add

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 015c8bb7cca4867b2dc0d54091f5901d209f52cf..23faf3129fb65ec5592c5021d661498143d4f608 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -8,7 +8,7 @@ static const char prune_packed_usage[] =
 #define DRY_RUN 01
 #define VERBOSE 02
 
-static struct progress progress;
+static struct progress *progress;
 
 static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
 {
@@ -26,12 +26,11 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
                if (!has_sha1_pack(sha1, NULL))
                        continue;
                memcpy(pathname + len, de->d_name, 38);
-               if (opts == VERBOSE)
-                       display_progress(&progress, i + 1);
                if (opts & DRY_RUN)
                        printf("rm -f %s\n", pathname);
                else if (unlink(pathname) < 0)
                        error("unable to unlink %s", pathname);
+               display_progress(progress, i + 1);
        }
        pathname[len] = 0;
        rmdir(pathname);
@@ -45,8 +44,7 @@ void prune_packed_objects(int opts)
        int len = strlen(dir);
 
        if (opts == VERBOSE)
-               start_progress_delay(&progress,
-                       "Removing duplicate objects",
+               progress = start_progress_delay("Removing duplicate objects",
                        256, 95, 2);
 
        if (len > PATH_MAX - 42)
@@ -64,8 +62,7 @@ void prune_packed_objects(int opts)
                prune_dir(i, d, pathname, len + 3, opts);
                closedir(d);
        }
-       if (opts == VERBOSE)
-               stop_progress(&progress);
+       stop_progress(&progress);
 }
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)