Merge branch 'jt/sha1-file-cleanup' into next

diff --git a/builtin/describe.c b/builtin/describe.c
index 19eacdd170d98ea583cc2eb373247df600be24d7..9c13c6817bd784fb9c0e3eff781911577ef7ef8c 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -54,9 +54,14 @@ static const char *prio_names[] = {
        N_("head"), N_("lightweight"), N_("annotated"),
 };
 
-static int commit_name_cmp(const struct commit_name *cn1,
-               const struct commit_name *cn2, const void *peeled)
+static int commit_name_cmp(const void *unused_cmp_data,
+                          const void *entry,
+                          const void *entry_or_key,
+                          const void *peeled)
 {
+       const struct commit_name *cn1 = entry;
+       const struct commit_name *cn2 = entry_or_key;
+
        return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled);
 }
 
@@ -501,7 +506,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                return cmd_name_rev(args.argc, args.argv, prefix);
        }
 
-       hashmap_init(&names, (hashmap_cmp_fn) commit_name_cmp, 0);
+       hashmap_init(&names, commit_name_cmp, NULL, 0);
        for_each_rawref(get_name, NULL);
        if (!names.size && !always)
                die(_("No names found, cannot describe anything."));