Allow the user to control the verbosity of merge-recursive.

diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index 9e3e537f38ce18cdfbf64a54852351e4e7c258bf..b4f15cc38ab7fa045fc5cf025ca3fd6251a01973 100644 (file)
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include "builtin.h"
 #include "cache.h"
 #include "commit.h"
@@ -75,7 +74,7 @@ static void name_rev(struct commit *commit,
        }
 }
 
-static int name_ref(const char *path, const unsigned char *sha1, void *cb_data)
+static int name_ref(const char *path, const unsigned char *sha1, int flags, void *cb_data)
 {
        struct object *o = parse_object(sha1);
        int tags_only = *(int*)cb_data;