mirror of
https://github.com/git/git.git
synced 2024-05-26 09:26:37 +02:00
73118f89b8
merge_recursive_generic() takes, in comparison to to merge_recursive(),
no commit ("struct commit *") arguments but SHA ids ("unsigned char *"),
and no commit list of bases but an array of refs ("const char **").
This makes it more generic in the case that it can also take the SHA
of a tree to merge trees without commits, for the bases, the head
and the remote.
merge_recursive_generic() also handles locking and updating of the
index, which is a common use case of merge_recursive().
This patch also rewrites builtin-merge-recursive.c to make use of
merge_recursive_generic(). By doing this, I stumbled over the
limitation of 20 bases and I've added a warning if this limitation
is exceeded.
This patch qualifies make_virtual_commit() as static again because
this function is not needed anymore outside merge-recursive.c.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
27 lines
779 B
C
27 lines
779 B
C
#ifndef MERGE_RECURSIVE_H
|
|
#define MERGE_RECURSIVE_H
|
|
|
|
int merge_recursive(struct commit *h1,
|
|
struct commit *h2,
|
|
const char *branch1,
|
|
const char *branch2,
|
|
struct commit_list *ancestors,
|
|
struct commit **result);
|
|
|
|
int merge_trees(struct tree *head,
|
|
struct tree *merge,
|
|
struct tree *common,
|
|
const char *branch1,
|
|
const char *branch2,
|
|
struct tree **result);
|
|
extern int merge_recursive_generic(const char **base_list,
|
|
const unsigned char *head_sha1, const char *head_name,
|
|
const unsigned char *next_sha1, const char *next_name);
|
|
int merge_recursive_config(const char *var, const char *value, void *cb);
|
|
void merge_recursive_setup(int is_subtree_merge);
|
|
struct tree *write_tree_from_memory(void);
|
|
|
|
extern int merge_recursive_verbosity;
|
|
|
|
#endif
|