merge-recursive: Fix code checking for D/F conflicts still being present
[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
MV
19 int verbosity;
20 int diff_rename_limit;
21 int merge_rename_limit;
10ae7526 22 int rename_score;
bf0ab10f 23 int needed_rename_limit;
99bfc669 24 int show_rename_progress;
5033639c 25 int call_depth;
c7d84924 26 struct strbuf obuf;
696ee23c
MV
27 struct string_list current_file_set;
28 struct string_list current_directory_set;
8a2fce18
MV
29};
30
31/* merge_trees() but with recursive ancestor consolidation */
32int merge_recursive(struct merge_options *o,
33 struct commit *h1,
e1b3a2ca 34 struct commit *h2,
e1b3a2ca
DB
35 struct commit_list *ancestors,
36 struct commit **result);
37
8a2fce18
MV
38/* rename-detecting three-way merge, no recursion */
39int merge_trees(struct merge_options *o,
40 struct tree *head,
e1b3a2ca
DB
41 struct tree *merge,
42 struct tree *common,
e1b3a2ca 43 struct tree **result);
e1b3a2ca 44
8a2fce18
MV
45/*
46 * "git-merge-recursive" can be fed trees; wrap them into
47 * virtual commits and call merge_recursive() proper.
48 */
49int merge_recursive_generic(struct merge_options *o,
50 const unsigned char *head,
51 const unsigned char *merge,
52 int num_ca,
53 const unsigned char **ca,
54 struct commit **result);
55
56void init_merge_options(struct merge_options *o);
57struct tree *write_tree_from_memory(struct merge_options *o);
9047ebbc 58
635a7bb1
JN
59int parse_merge_opt(struct merge_options *out, const char *s);
60
c674d052 61/* builtin/merge.c */
67ac1e1d
JN
62int try_merge_command(const char *strategy, size_t xopts_nr,
63 const char **xopts, struct commit_list *common,
64 const char *head_arg, struct commit_list *remotes);
c674d052 65
e1b3a2ca 66#endif