Merge branch 'maint'

diff --git a/describe.c b/describe.c
index ea0f2ce55bf7e20109f43e41908a580f7fdb6eac..f4029ee74e80305e9ec9e5793d2e12c07096f45a 100644 (file)
--- a/describe.c
+++ b/describe.c
@@ -53,7 +53,7 @@ static void add_to_known_names(const char *path,
        names = ++idx;
 }
 
-static int get_name(const char *path, const unsigned char *sha1, void *cb_data)
+static int get_name(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 {
        struct commit *commit = lookup_commit_reference_gently(sha1, 1);
        struct object *object;