Merge branch 'js/read-tree' into js/c-merge-recursive

[git.git] / builtin-prune.c

diff --git a/builtin-prune.c b/builtin-prune.c
index ebdecee9280ab81831b08b59b832f4fb61cdc197..6a86eb52aedc45b0a59adad4da31341440f2f82e 100644 (file)
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -158,15 +158,15 @@ static void walk_commit_list(struct rev_info *revs)
                struct object_array_entry *pending = revs->pending.objects + i;
                struct object *obj = pending->item;
                const char *name = pending->name;
-               if (obj->type == TYPE_TAG) {
+               if (obj->type == OBJ_TAG) {
                        process_tag((struct tag *) obj, &objects, name);
                        continue;
                }
-               if (obj->type == TYPE_TREE) {
+               if (obj->type == OBJ_TREE) {
                        process_tree((struct tree *)obj, &objects, NULL, name);
                        continue;
                }
-               if (obj->type == TYPE_BLOB) {
+               if (obj->type == OBJ_BLOB) {
                        process_blob((struct blob *)obj, &objects, NULL, name);
                        continue;
                }
@@ -217,7 +217,7 @@ static void add_cache_refs(void)
                add_cache_tree(active_cache_tree);
 }
 
-int cmd_prune(int argc, const char **argv, char **envp)
+int cmd_prune(int argc, const char **argv, const char *prefix)
 {
        int i;
 
@@ -234,7 +234,7 @@ int cmd_prune(int argc, const char **argv, char **envp)
         * Set up revision parsing, and mark us as being interested
         * in all object types, not just commits.
         */
-       init_revisions(&revs);
+       init_revisions(&revs, prefix);
        revs.tag_objects = 1;
        revs.blob_objects = 1;
        revs.tree_objects = 1;