]>
Commit | Line | Data |
---|---|---|
16da134b JS |
1 | #ifndef UNPACK_TREES_H |
2 | #define UNPACK_TREES_H | |
3 | ||
ca885a4f JH |
4 | #define MAX_UNPACK_TREES 8 |
5 | ||
16da134b JS |
6 | struct unpack_trees_options; |
7 | ||
8 | typedef int (*merge_fn_t)(struct cache_entry **src, | |
34110cd4 | 9 | struct unpack_trees_options *options); |
16da134b | 10 | |
8ccba008 JH |
11 | struct 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 | ||
16da134b | 19 | struct unpack_trees_options { |
75dc6c7c LT |
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, | |
55218834 | 29 | initial_checkout:1, |
75dc6c7c | 30 | gently:1; |
16da134b | 31 | const char *prefix; |
9a4d8fdc | 32 | int pos; |
f8a9d428 | 33 | struct dir_struct *dir; |
16da134b | 34 | merge_fn_t fn; |
8ccba008 | 35 | struct unpack_trees_error_msgs msgs; |
16da134b JS |
36 | |
37 | int head_idx; | |
38 | int merge_size; | |
39 | ||
40 | struct cache_entry *df_conflict_entry; | |
d1f2d7e8 | 41 | void *unpack_data; |
34110cd4 LT |
42 | |
43 | struct index_state *dst_index; | |
32260ad5 | 44 | struct index_state *src_index; |
34110cd4 | 45 | struct index_state result; |
16da134b JS |
46 | }; |
47 | ||
933bf40a | 48 | extern int unpack_trees(unsigned n, struct tree_desc *t, |
16da134b JS |
49 | struct unpack_trees_options *options); |
50 | ||
34110cd4 LT |
51 | int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o); |
52 | int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o); | |
53 | int bind_merge(struct cache_entry **src, struct unpack_trees_options *o); | |
54 | int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o); | |
076b0adc | 55 | |
16da134b | 56 | #endif |