merge-recursive: make a helper function for cleanup for handle_renames
[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;
f1e2426b 16 unsigned buffer_output; /* 1: output at end, 2: keep buffered */
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;
fc65b00d 28 struct hashmap current_file_dir_set;
70cc3d36 29 struct string_list df_conflict_file_set;
ea625cb0
EN
30};
31
8a2fce18
MV
32/* merge_trees() but with recursive ancestor consolidation */
33int merge_recursive(struct merge_options *o,
34 struct commit *h1,
e1b3a2ca 35 struct commit *h2,
e1b3a2ca
DB
36 struct commit_list *ancestors,
37 struct commit **result);
38
8a2fce18
MV
39/* rename-detecting three-way merge, no recursion */
40int merge_trees(struct merge_options *o,
41 struct tree *head,
e1b3a2ca
DB
42 struct tree *merge,
43 struct tree *common,
e1b3a2ca 44 struct tree **result);
e1b3a2ca 45
8a2fce18
MV
46/*
47 * "git-merge-recursive" can be fed trees; wrap them into
48 * virtual commits and call merge_recursive() proper.
49 */
50int merge_recursive_generic(struct merge_options *o,
4e8161a8 51 const struct object_id *head,
52 const struct object_id *merge,
8a2fce18 53 int num_ca,
4e8161a8 54 const struct object_id **ca,
8a2fce18
MV
55 struct commit **result);
56
57void init_merge_options(struct merge_options *o);
58struct tree *write_tree_from_memory(struct merge_options *o);
9047ebbc 59
635a7bb1
JN
60int parse_merge_opt(struct merge_options *out, const char *s);
61
e1b3a2ca 62#endif