1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
4#define MAX_UNPACK_TREES 8
5
6struct unpack_trees_options;
7
8typedef int (*merge_fn_t)(struct cache_entry **src,
9 struct unpack_trees_options *options);
10
11struct unpack_trees_error_msgs {
12 const char *would_overwrite;
13 const char *not_uptodate_file;
14 const char *not_uptodate_dir;
15 const char *would_lose_untracked;
16 const char *bind_overlap;
17};
18
19struct unpack_trees_options {
20 unsigned int reset:1,
21 merge:1,
22 update:1,
23 index_only:1,
24 nontrivial_merge:1,
25 trivial_merges_only:1,
26 verbose_update:1,
27 aggressive:1,
28 skip_unmerged:1,
29 initial_checkout:1,
30 diff_index_cached:1,
31 gently:1;
32 const char *prefix;
33 int pos;
34 struct dir_struct *dir;
35 merge_fn_t fn;
36 struct unpack_trees_error_msgs msgs;
37
38 int head_idx;
39 int merge_size;
40
41 struct cache_entry *df_conflict_entry;
42 void *unpack_data;
43
44 struct index_state *dst_index;
45 struct index_state *src_index;
46 struct index_state result;
47};
48
49extern int unpack_trees(unsigned n, struct tree_desc *t,
50 struct unpack_trees_options *options);
51
52int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
53int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
54int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
55int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
56
57#endif