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>
Nguyễn Thái Ngọc Duy committed
May 19, 2018 at 07:28 UTC
e2e5ac2303377c28e82b6044b06caebe4a1734c9
4 files changed
+29
-18
builtin/merge.c
+13
-12
@@ -443,6 +443,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
443
struct object_id branch_head;
444
struct strbuf buf = STRBUF_INIT;
445
struct strbuf bname = STRBUF_INIT;
446
+ struct merge_remote_desc *desc;
447
const char *ptr;
448
char *found_ref;
449
int len, early;
@@ -515,16 +516,13 @@ static void merge_name(const char *remote, struct strbuf *msg)
516
strbuf_release(&truname);
517
}
518
518
- if (remote_head->util) {
519
- struct merge_remote_desc *desc;
520
- desc = merge_remote_util(remote_head);
521
- if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
522
- strbuf_addf(msg, "%s\t\t%s '%s'\n",
523
- oid_to_hex(&desc->obj->oid),
524
- type_name(desc->obj->type),
525
- remote);
526
- goto cleanup;
527
- }
519
+ desc = merge_remote_util(remote_head);
520
+ if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
521
+ strbuf_addf(msg, "%s\t\t%s '%s'\n",
522
+ oid_to_hex(&desc->obj->oid),
523
+ type_name(desc->obj->type),
524
+ remote);
525
+ goto cleanup;
526
}
527
528
strbuf_addf(msg, "%s\t\tcommit '%s'\n",
@@ -932,8 +930,11 @@ static void write_merge_heads(struct commit_list *remoteheads)
930
for (j = remoteheads; j; j = j->next) {
931
struct object_id *oid;
932
struct commit *c = j->item;
935
- if (c->util && merge_remote_util(c)->obj) {
936
- oid = &merge_remote_util(c)->obj->oid;
933
+ struct merge_remote_desc *desc;
934
+
935
+ desc = merge_remote_util(c);
936
+ if (desc && desc->obj) {
937
+ oid = &desc->obj->oid;
938
} else {
939
oid = &c->object.oid;
940
}
commit.c
+10
-2
@@ -1574,13 +1574,21 @@ out:
1574
return result;
1575
}
1576
1577
+define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
1578
+static struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab);
1579
+
1580
+struct merge_remote_desc *merge_remote_util(struct commit *commit)
1581
+{
1582
+ return *merge_desc_slab_at(&merge_desc_slab, commit);
1583
+}
1584
+
1585
void set_merge_remote_desc(struct commit *commit,
1586
const char *name, struct object *obj)
1587
{
1588
struct merge_remote_desc *desc;
1589
FLEX_ALLOC_STR(desc, name, name);
1590
desc->obj = obj;
1583
- commit->util = desc;
1591
+ *merge_desc_slab_at(&merge_desc_slab, commit) = desc;
1592
}
1593
1594
struct commit *get_merge_parent(const char *name)
@@ -1592,7 +1600,7 @@ struct commit *get_merge_parent(const char *name)
1600
return NULL;
1601
obj = parse_object(&oid);
1602
commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1595
- if (commit && !commit->util)
1603
+ if (commit && !merge_remote_util(commit))
1604
set_merge_remote_desc(commit, name, obj);
1605
return commit;
1606
}
commit.h
+1
-1
@@ -303,7 +303,7 @@ struct merge_remote_desc {
303
struct object *obj; /* the named object, could be a tag */
304
char name[FLEX_ARRAY];
305
};
306
-#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
306
+extern struct merge_remote_desc *merge_remote_util(struct commit *);
307
extern void set_merge_remote_desc(struct commit *commit,
308
const char *name, struct object *obj);
309
merge-recursive.c
+5
-3
@@ -223,10 +223,12 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
223
224
static void output_commit_title(struct merge_options *o, struct commit *commit)
225
{
226
+ struct merge_remote_desc *desc;
227
+
228
strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
227
- if (commit->util)
228
- strbuf_addf(&o->obuf, "virtual %s\n",
229
- merge_remote_util(commit)->name);
229
+ desc = merge_remote_util(commit);
230
+ if (desc)
231
+ strbuf_addf(&o->obuf, "virtual %s\n", desc->name);
232
else {
233
strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
234
DEFAULT_ABBREV);