]>
Commit | Line | Data |
---|---|---|
e1b3a2ca DB |
1 | #ifndef MERGE_RECURSIVE_H |
2 | #define MERGE_RECURSIVE_H | |
3 | ||
696ee23c MV |
4 | #include "string-list.h" |
5 | ||
8a2fce18 | 6 | struct merge_options { |
4c5868f4 | 7 | const char *ancestor; |
8a2fce18 MV |
8 | const char *branch1; |
9 | const char *branch2; | |
8cc5b290 | 10 | enum { |
85e51b78 | 11 | MERGE_RECURSIVE_NORMAL = 0, |
8cc5b290 | 12 | MERGE_RECURSIVE_OURS, |
4b05548f | 13 | MERGE_RECURSIVE_THEIRS |
8cc5b290 | 14 | } recursive_variant; |
85e51b78 | 15 | const char *subtree_shift; |
8a2fce18 | 16 | unsigned buffer_output : 1; |
1bc0ab7c | 17 | unsigned renormalize : 1; |
58a1ece4 | 18 | long xdl_opts; |
8a2fce18 MV |
19 | int verbosity; |
20 | int diff_rename_limit; | |
21 | int merge_rename_limit; | |
10ae7526 | 22 | int rename_score; |
5033639c | 23 | int call_depth; |
c7d84924 | 24 | struct strbuf obuf; |
696ee23c MV |
25 | struct string_list current_file_set; |
26 | struct string_list current_directory_set; | |
8a2fce18 MV |
27 | }; |
28 | ||
29 | /* merge_trees() but with recursive ancestor consolidation */ | |
30 | int merge_recursive(struct merge_options *o, | |
31 | struct commit *h1, | |
e1b3a2ca | 32 | struct commit *h2, |
e1b3a2ca DB |
33 | struct commit_list *ancestors, |
34 | struct commit **result); | |
35 | ||
8a2fce18 MV |
36 | /* rename-detecting three-way merge, no recursion */ |
37 | int merge_trees(struct merge_options *o, | |
38 | struct tree *head, | |
e1b3a2ca DB |
39 | struct tree *merge, |
40 | struct tree *common, | |
e1b3a2ca | 41 | struct tree **result); |
e1b3a2ca | 42 | |
8a2fce18 MV |
43 | /* |
44 | * "git-merge-recursive" can be fed trees; wrap them into | |
45 | * virtual commits and call merge_recursive() proper. | |
46 | */ | |
47 | int merge_recursive_generic(struct merge_options *o, | |
48 | const unsigned char *head, | |
49 | const unsigned char *merge, | |
50 | int num_ca, | |
51 | const unsigned char **ca, | |
52 | struct commit **result); | |
53 | ||
54 | void init_merge_options(struct merge_options *o); | |
55 | struct tree *write_tree_from_memory(struct merge_options *o); | |
9047ebbc | 56 | |
635a7bb1 JN |
57 | int parse_merge_opt(struct merge_options *out, const char *s); |
58 | ||
c674d052 CC |
59 | /* builtin/merge.c */ |
60 | int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes); | |
61 | ||
e1b3a2ca | 62 | #endif |