1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 #include "string-list.h"
11 MERGE_RECURSIVE_NORMAL
= 0,
13 MERGE_RECURSIVE_THEIRS
15 const char *subtree_shift
;
16 unsigned buffer_output
; /* 1: output at end, 2: keep buffered */
17 unsigned renormalize
: 1;
21 int diff_rename_limit
;
22 int merge_rename_limit
;
24 int needed_rename_limit
;
25 int show_rename_progress
;
28 struct hashmap current_file_dir_set
;
29 struct string_list df_conflict_file_set
;
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:
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
42 struct dir_rename_entry
{
43 struct hashmap_entry ent
; /* must be the first member! */
45 unsigned non_unique_new_dir
:1;
46 struct strbuf new_dir
;
47 struct string_list possible_new_dirs
;
50 struct collision_entry
{
51 struct hashmap_entry ent
; /* must be the first member! */
53 struct string_list source_files
;
54 unsigned reported_already
:1;
57 /* merge_trees() but with recursive ancestor consolidation */
58 int merge_recursive(struct merge_options
*o
,
61 struct commit_list
*ancestors
,
62 struct commit
**result
);
64 /* rename-detecting three-way merge, no recursion */
65 int merge_trees(struct merge_options
*o
,
69 struct tree
**result
);
72 * "git-merge-recursive" can be fed trees; wrap them into
73 * virtual commits and call merge_recursive() proper.
75 int merge_recursive_generic(struct merge_options
*o
,
76 const struct object_id
*head
,
77 const struct object_id
*merge
,
79 const struct object_id
**ca
,
80 struct commit
**result
);
82 void init_merge_options(struct merge_options
*o
);
83 struct tree
*write_tree_from_memory(struct merge_options
*o
);
85 int parse_merge_opt(struct merge_options
*out
, const char *s
);