Merge branch 'maint'

[git.git] / builtin-prune-packed.c

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index c66fb037f6ef10e370b1a405e8e27dbb0e753a17..10cb8df8457fd5f2ba9be62ecd0f9384e21c3e63 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -3,7 +3,7 @@
 #include "progress.h"
 
 static const char prune_packed_usage[] =
-"git-prune-packed [-n] [-q]";
+"git prune-packed [-n] [-q]";
 
 #define DRY_RUN 01
 #define VERBOSE 02
@@ -15,9 +15,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
        struct dirent *de;
        char hex[40];
 
-       if (opts == VERBOSE)
-               display_progress(progress, i + 1);
-
        sprintf(hex, "%02x", i);
        while ((de = readdir(dir)) != NULL) {
                unsigned char sha1[20];
@@ -33,6 +30,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
                        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);
@@ -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)
@@ -88,7 +85,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
                /* Handle arguments here .. */
                usage(prune_packed_usage);
        }
-       sync();
        prune_packed_objects(opts);
        return 0;
 }