merge-recursive: check for directory level conflicts
[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;
8a2fce18
MV
30};
31
8383408d
EN
32/*
33 * For dir_rename_entry, directory names are stored as a full path from the
34 * toplevel of the repository and do not include a trailing '/'. Also:
35 *
36 * dir: original name of directory being renamed
37 * non_unique_new_dir: if true, could not determine new_dir
38 * new_dir: final name of directory being renamed
39 * possible_new_dirs: temporary used to help determine new_dir; see comments
40 * in get_directory_renames() for details
41 */
42struct dir_rename_entry {
43 struct hashmap_entry ent; /* must be the first member! */
44 char *dir;
45 unsigned non_unique_new_dir:1;
46 struct strbuf new_dir;
47 struct string_list possible_new_dirs;
48};
49
8a2fce18
MV
50/* merge_trees() but with recursive ancestor consolidation */
51int merge_recursive(struct merge_options *o,
52 struct commit *h1,
e1b3a2ca 53 struct commit *h2,
e1b3a2ca
DB
54 struct commit_list *ancestors,
55 struct commit **result);
56
8a2fce18
MV
57/* rename-detecting three-way merge, no recursion */
58int merge_trees(struct merge_options *o,
59 struct tree *head,
e1b3a2ca
DB
60 struct tree *merge,
61 struct tree *common,
e1b3a2ca 62 struct tree **result);
e1b3a2ca 63
8a2fce18
MV
64/*
65 * "git-merge-recursive" can be fed trees; wrap them into
66 * virtual commits and call merge_recursive() proper.
67 */
68int merge_recursive_generic(struct merge_options *o,
4e8161a8 69 const struct object_id *head,
70 const struct object_id *merge,
8a2fce18 71 int num_ca,
4e8161a8 72 const struct object_id **ca,
8a2fce18
MV
73 struct commit **result);
74
75void init_merge_options(struct merge_options *o);
76struct tree *write_tree_from_memory(struct merge_options *o);
9047ebbc 77
635a7bb1
JN
78int parse_merge_opt(struct merge_options *out, const char *s);
79
e1b3a2ca 80#endif