X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-prune.c;h=6228c7907b183fb686c9f4cc54347c3dc16f3ec4;hb=e70866f53a8d31cde6cfff6396ba0d1f64029afb;hp=d196c41f13aee5992fe60febffa01ed4d640a97b;hpb=2dcb927f37976ef5185cef5452516b170b14cd6c;p=git.git diff --git a/builtin-prune.c b/builtin-prune.c index d196c41f1..6228c7907 100644 --- 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; @@ -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;