1#ifndef MERGE_RECURSIVE_H
2#define MERGE_RECURSIVE_H
3
4#include "string-list.h"
5
6struct merge_options {
7 const char *ancestor;
8 const char *branch1;
9 const char *branch2;
10 enum {
11 MERGE_RECURSIVE_NORMAL = 0,
12 MERGE_RECURSIVE_OURS,
13 MERGE_RECURSIVE_THEIRS
14 } recursive_variant;
15 const char *subtree_shift;
16 unsigned buffer_output : 1;
17 unsigned renormalize : 1;
18 int verbosity;
19 int diff_rename_limit;
20 int merge_rename_limit;
21 int call_depth;
22 struct strbuf obuf;
23 struct string_list current_file_set;
24 struct string_list current_directory_set;
25};
26
27/*
28 * Sets the list of user-friendly error messages to be used by the
29 * command "cmd" (either merge or checkout)
30 */
31void set_porcelain_error_msgs(const char **msgs, const char *cmd);
32
33/* merge_trees() but with recursive ancestor consolidation */
34int merge_recursive(struct merge_options *o,
35 struct commit *h1,
36 struct commit *h2,
37 struct commit_list *ancestors,
38 struct commit **result);
39
40/* rename-detecting three-way merge, no recursion */
41int merge_trees(struct merge_options *o,
42 struct tree *head,
43 struct tree *merge,
44 struct tree *common,
45 struct tree **result);
46
47/*
48 * "git-merge-recursive" can be fed trees; wrap them into
49 * virtual commits and call merge_recursive() proper.
50 */
51int merge_recursive_generic(struct merge_options *o,
52 const unsigned char *head,
53 const unsigned char *merge,
54 int num_ca,
55 const unsigned char **ca,
56 struct commit **result);
57
58void init_merge_options(struct merge_options *o);
59struct tree *write_tree_from_memory(struct merge_options *o);
60
61/* builtin/merge.c */
62int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
63
64#endif