Merge branch 'maint'

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index d0ff336c1479a772f9658ccc52d561469116707d..d3dd94d9ef7a50e156488ea5e9236d6d55f6e190 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 
 static const char prune_packed_usage[] =
@@ -54,7 +55,7 @@ static void prune_packed_objects(void)
        }
 }
 
-int cmd_prune_packed(int argc, char **argv, const char *prefix)
+int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
        int i;