gitweb: use new Git::Repo API, and add optional caching
[git/gitweb-caching.git] / unpack-trees.h
blob94e567265af9a69a30dd5c578439b6444e50004d
1 #ifndef UNPACK_TREES_H
2 #define UNPACK_TREES_H
4 #define MAX_UNPACK_TREES 8
6 struct unpack_trees_options;
8 typedef int (*merge_fn_t)(struct cache_entry **src,
9 struct unpack_trees_options *options);
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;
19 struct 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 gently:1;
30 const char *prefix;
31 int pos;
32 struct dir_struct *dir;
33 merge_fn_t fn;
34 struct unpack_trees_error_msgs msgs;
36 int head_idx;
37 int merge_size;
39 struct cache_entry *df_conflict_entry;
40 void *unpack_data;
42 struct index_state *dst_index;
43 struct index_state *src_index;
44 struct index_state result;
47 extern int unpack_trees(unsigned n, struct tree_desc *t,
48 struct unpack_trees_options *options);
50 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
51 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
52 int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
53 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
55 #endif