Merge branch 'maint'

diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 2b218425aab2c37a826bfbe22535f2e5b7002a26..0afa1c5c41e79a05ddebb7d874956163510daf0b 100644 (file)
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "object.h"
@@ -796,7 +797,7 @@ static struct ref_sort *default_sort(void)
        return sort;
 }
 
-int cmd_for_each_ref(int ac, const char **av, char *prefix)
+int cmd_for_each_ref(int ac, const char **av, const char *prefix)
 {
        int i, num_refs;
        const char *format = NULL;