diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-19 07:28:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-21 07:07:20 +0200 |
| commit | e2e5ac2303377c28e82b6044b06caebe4a1734c9 (patch) | |
| tree | 7f44f4214e6c8d9913592154949195fbb4037012 /commit.h | |
| parent | log: use commit-slab in prepare_bases() instead of commit->util (diff) | |
| download | git-e2e5ac2303377c28e82b6044b06caebe4a1734c9.tar.xz git-e2e5ac2303377c28e82b6044b06caebe4a1734c9.zip | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |