Make 'unpack_trees()' take the index to work on as an argument
[git/git.git] / unpack-trees.h
CommitLineData
16da134b
JS
1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
4struct unpack_trees_options;
5
6typedef int (*merge_fn_t)(struct cache_entry **src,
b48d5a05
LT
7 struct unpack_trees_options *options,
8 int remove);
16da134b
JS
9
10struct unpack_trees_options {
11 int reset;
12 int merge;
13 int update;
14 int index_only;
15 int nontrivial_merge;
16 int trivial_merges_only;
17 int verbose_update;
18 int aggressive;
4e7c4571 19 int skip_unmerged;
17e46426 20 int gently;
16da134b 21 const char *prefix;
9a4d8fdc 22 int pos;
f8a9d428 23 struct dir_struct *dir;
16da134b
JS
24 merge_fn_t fn;
25
26 int head_idx;
27 int merge_size;
28
29 struct cache_entry *df_conflict_entry;
d1f2d7e8 30 void *unpack_data;
bc052d7f 31 struct index_state *index;
16da134b
JS
32};
33
933bf40a 34extern int unpack_trees(unsigned n, struct tree_desc *t,
16da134b
JS
35 struct unpack_trees_options *options);
36
b48d5a05
LT
37int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o, int);
38int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
39int bind_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
40int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
076b0adc 41
16da134b 42#endif