Skip to content

Commit beb518c

Browse files
rscharfegitster
authored andcommitted
commit: factor out set_merge_remote_desc()
Export a helper function for allocating, populating and attaching a merge_remote_desc to a commit. Signed-off-by: Rene Scharfe <[email protected]> Reviewed-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c089320 commit beb518c

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

commit.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,6 +1576,16 @@ int commit_tree_extended(const char *msg, size_t msg_len,
15761576
return result;
15771577
}
15781578

1579+
void set_merge_remote_desc(struct commit *commit,
1580+
const char *name, struct object *obj)
1581+
{
1582+
struct merge_remote_desc *desc;
1583+
desc = xmalloc(sizeof(*desc));
1584+
desc->obj = obj;
1585+
desc->name = xstrdup(name);
1586+
commit->util = desc;
1587+
}
1588+
15791589
struct commit *get_merge_parent(const char *name)
15801590
{
15811591
struct object *obj;
@@ -1585,13 +1595,8 @@ struct commit *get_merge_parent(const char *name)
15851595
return NULL;
15861596
obj = parse_object(oid.hash);
15871597
commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1588-
if (commit && !commit->util) {
1589-
struct merge_remote_desc *desc;
1590-
desc = xmalloc(sizeof(*desc));
1591-
desc->obj = obj;
1592-
desc->name = xstrdup(name);
1593-
commit->util = desc;
1594-
}
1598+
if (commit && !commit->util)
1599+
set_merge_remote_desc(commit, name, obj);
15951600
return commit;
15961601
}
15971602

commit.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,8 @@ struct merge_remote_desc {
359359
const char *name;
360360
};
361361
#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
362+
extern void set_merge_remote_desc(struct commit *commit,
363+
const char *name, struct object *obj);
362364

363365
/*
364366
* Given "name" from the command line to merge, find the commit object

0 commit comments

Comments
 (0)