]>
Commit | Line | Data |
---|---|---|
1 | #ifndef MERGE_RECURSIVE_H | |
2 | #define MERGE_RECURSIVE_H | |
3 | ||
4 | #include "string-list.h" | |
5 | ||
6 | struct 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 | long xdl_opts; | |
19 | int verbosity; | |
20 | int diff_rename_limit; | |
21 | int merge_rename_limit; | |
22 | int rename_score; | |
23 | int needed_rename_limit; | |
24 | int show_rename_progress; | |
25 | int call_depth; | |
26 | struct strbuf obuf; | |
27 | struct string_list current_file_set; | |
28 | struct string_list current_directory_set; | |
29 | struct string_list df_conflict_file_set; | |
30 | }; | |
31 | ||
32 | /* merge_trees() but with recursive ancestor consolidation */ | |
33 | int merge_recursive(struct merge_options *o, | |
34 | struct commit *h1, | |
35 | struct commit *h2, | |
36 | struct commit_list *ancestors, | |
37 | struct commit **result); | |
38 | ||
39 | /* rename-detecting three-way merge, no recursion */ | |
40 | int merge_trees(struct merge_options *o, | |
41 | struct tree *head, | |
42 | struct tree *merge, | |
43 | struct tree *common, | |
44 | struct tree **result); | |
45 | ||
46 | /* | |
47 | * "git-merge-recursive" can be fed trees; wrap them into | |
48 | * virtual commits and call merge_recursive() proper. | |
49 | */ | |
50 | int merge_recursive_generic(struct merge_options *o, | |
51 | const unsigned char *head, | |
52 | const unsigned char *merge, | |
53 | int num_ca, | |
54 | const unsigned char **ca, | |
55 | struct commit **result); | |
56 | ||
57 | void init_merge_options(struct merge_options *o); | |
58 | struct tree *write_tree_from_memory(struct merge_options *o); | |
59 | ||
60 | int parse_merge_opt(struct merge_options *out, const char *s); | |
61 | ||
62 | /* builtin/merge.c */ | |
63 | int try_merge_command(const char *strategy, size_t xopts_nr, | |
64 | const char **xopts, struct commit_list *common, | |
65 | const char *head_arg, struct commit_list *remotes); | |
66 | ||
67 | #endif |