Merge branch 'jc/apply'

[git.git] / builtin-prune.c

diff --git a/builtin-prune.c b/builtin-prune.c
index d196c41f13aee5992fe60febffa01ed4d640a97b..fc885ce55bbb3a44367b8cec1ea66b1918c78f15 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)
@@ -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;