merge-recursive: convert leaf functions to use struct object_id
[git/git.git] / merge-recursive.h
CommitLineData
e1b3a2ca
DB
1#ifndef MERGE_RECURSIVE_H
2#define MERGE_RECURSIVE_H
3
696ee23c
MV
4#include "string-list.h"
5
8a2fce18 6struct 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 19 int verbosity;
d2b11eca 20 int detect_rename;
8a2fce18
MV
21 int diff_rename_limit;
22 int merge_rename_limit;
10ae7526 23 int rename_score;
bf0ab10f 24 int needed_rename_limit;
99bfc669 25 int show_rename_progress;
5033639c 26 int call_depth;
c7d84924 27 struct strbuf obuf;
696ee23c
MV
28 struct string_list current_file_set;
29 struct string_list current_directory_set;
70cc3d36 30 struct string_list df_conflict_file_set;
8a2fce18
MV
31};
32
33/* merge_trees() but with recursive ancestor consolidation */
34int merge_recursive(struct merge_options *o,
35 struct commit *h1,
e1b3a2ca 36 struct commit *h2,
e1b3a2ca
DB
37 struct commit_list *ancestors,
38 struct commit **result);
39
8a2fce18
MV
40/* rename-detecting three-way merge, no recursion */
41int merge_trees(struct merge_options *o,
42 struct tree *head,
e1b3a2ca
DB
43 struct tree *merge,
44 struct tree *common,
e1b3a2ca 45 struct tree **result);
e1b3a2ca 46
8a2fce18
MV
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);
9047ebbc 60
635a7bb1
JN
61int parse_merge_opt(struct merge_options *out, const char *s);
62
e1b3a2ca 63#endif