summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-05-19 05:28:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-21 05:07:20 (GMT)
commite2e5ac2303377c28e82b6044b06caebe4a1734c9 (patch)
tree7f44f4214e6c8d9913592154949195fbb4037012 /commit.h
parent7b680d32f3e3e2469733a7668fad2253bb4aeb4d (diff)
downloadgit-e2e5ac2303377c28e82b6044b06caebe4a1734c9.zip
git-e2e5ac2303377c28e82b6044b06caebe4a1734c9.tar.gz
git-e2e5ac2303377c28e82b6044b06caebe4a1734c9.tar.bz2
merge: use commit-slab in merge remote desc instead of commit->util
It's done so that commit->util can be removed. See more explanation in the commit that removes commit->util. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index e57ae4b..838f6a6 100644
--- 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);