read-trees: refactor the unpack_trees() part
[git/mingw/4msysgit.git] / unpack-trees.h
blob38af89a6b79ec49d403e2791c0c5f73b52f79cba
1 #ifndef UNPACK_TREES_H
2 #define UNPACK_TREES_H
4 struct unpack_trees_options;
6 typedef int (*merge_fn_t)(struct cache_entry **src,
7 struct unpack_trees_options *options);
9 struct unpack_trees_options {
10 int reset;
11 int merge;
12 int update;
13 int index_only;
14 int nontrivial_merge;
15 int trivial_merges_only;
16 int verbose_update;
17 int aggressive;
18 const char *prefix;
19 merge_fn_t fn;
21 int head_idx;
22 int merge_size;
24 struct cache_entry *df_conflict_entry;
27 extern int unpack_trees(struct object_list *trees,
28 struct unpack_trees_options *options);
30 #endif