merge: use commit-slab in merge remote desc instead of commit->util

diff --git a/commit.h b/commit.h
index e57ae4b58380cce6192cc6489682838677f048ce..838f6a6b266e220711653c4e67d6c8fe6d725196 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -303,7 +303,7 @@ struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */
        char name[FLEX_ARRAY];
 };
-#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
+extern struct merge_remote_desc *merge_remote_util(struct commit *);
 extern void set_merge_remote_desc(struct commit *commit,
                                  const char *name, struct object *obj);