#include "cache-tree.h"
static const char prune_usage[] = "git-prune [-n]";
-static int show_only = 0;
-static struct rev_info revs;
+static int show_only;
static int prune_object(char *path, const char *filename, const unsigned char *sha1)
{
+ char buf[20];
+ const char *type;
+
if (show_only) {
- printf("would prune %s/%s\n", path, filename);
+ if (sha1_object_info(sha1, buf, NULL))
+ type = "unknown";
+ else
+ type = buf;
+ printf("%s %s\n", sha1_to_hex(sha1), type);
return 0;
}
unlink(mkpath("%s/%s", path, filename));
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;
}
}
-static int add_one_ref(const char *path, const unsigned char *sha1)
+static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+{
+ struct object *object;
+ struct rev_info *revs = (struct rev_info *)cb_data;
+
+ object = parse_object(osha1);
+ if (object)
+ add_pending_object(revs, object, "");
+ object = parse_object(nsha1);
+ if (object)
+ add_pending_object(revs, object, "");
+ return 0;
+}
+
+static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
{
struct object *object = parse_object(sha1);
+ struct rev_info *revs = (struct rev_info *)cb_data;
+
if (!object)
die("bad object ref: %s:%s", path, sha1_to_hex(sha1));
- add_pending_object(&revs, object, "");
+ add_pending_object(revs, object, "");
+
+ for_each_reflog_ent(path, add_one_reflog_ent, cb_data);
+
return 0;
}
-static void add_one_tree(const unsigned char *sha1)
+static void add_one_tree(const unsigned char *sha1, struct rev_info *revs)
{
struct tree *tree = lookup_tree(sha1);
- add_pending_object(&revs, &tree->object, "");
+ add_pending_object(revs, &tree->object, "");
}
-static void add_cache_tree(struct cache_tree *it)
+static void add_cache_tree(struct cache_tree *it, struct rev_info *revs)
{
int i;
if (it->entry_count >= 0)
- add_one_tree(it->sha1);
+ add_one_tree(it->sha1, revs);
for (i = 0; i < it->subtree_nr; i++)
- add_cache_tree(it->down[i]->cache_tree);
+ add_cache_tree(it->down[i]->cache_tree, revs);
}
-static void add_cache_refs(void)
+static void add_cache_refs(struct rev_info *revs)
{
int i;
*/
}
if (active_cache_tree)
- add_cache_tree(active_cache_tree);
+ add_cache_tree(active_cache_tree, revs);
}
int cmd_prune(int argc, const char **argv, const char *prefix)
{
int i;
+ struct rev_info revs;
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
usage(prune_usage);
}
+ save_commit_buffer = 0;
+
/*
* Set up revision parsing, and mark us as being interested
* in all object types, not just commits.
revs.blob_objects = 1;
revs.tree_objects = 1;
- /* Add all external refs */
- for_each_ref(add_one_ref);
+ /* Add all external refs, along with its reflog info */
+ for_each_ref(add_one_ref, &revs);
/* Add all refs from the index file */
- add_cache_refs();
+ add_cache_refs(&revs);
/*
* Set up the revision walk - this will move all commits
prune_object_dir(get_object_directory());
+ sync();
+ prune_packed_objects(show_only);
return 0;
}