Only repack active packs by skipping over kept packs.

diff --git a/builtin-prune.c b/builtin-prune.c
index 6a86eb52aedc45b0a59adad4da31341440f2f82e..7290e6d9aa9e26cc8256a34ed22028e80936c010 100644 (file)
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -10,8 +10,8 @@
 #include "builtin.h"
 #include "cache-tree.h"
 
-static const char prune_usage[] = "git prune [-n]";
-static int show_only = 0;
+static const char prune_usage[] = "git-prune [-n]";
+static int show_only;
 static struct rev_info revs;
 
 static int prune_object(char *path, const char *filename, const unsigned char *sha1)
@@ -106,7 +106,7 @@ static void process_tree(struct tree *tree,
        obj->flags |= SEEN;
        if (parse_tree(tree) < 0)
                die("bad tree object %s", sha1_to_hex(obj->sha1));
-       name = strdup(name);
+       name = xstrdup(name);
        add_object(obj, p, path, name);
        me.up = path;
        me.elem = name;
@@ -255,5 +255,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 
        prune_object_dir(get_object_directory());
 
+       sync();
+       prune_packed_objects(show_only);
        return 0;
 }