summaryrefslogtreecommitdiff
path: root/unpack-trees.h
blob: 65add1652f77978e0e0aee4924b583aefa9978ce (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H
 
struct unpack_trees_options;
 
typedef int (*merge_fn_t)(struct cache_entry **src,
		struct unpack_trees_options *options,
		int remove);
 
struct unpack_trees_options {
	int reset;
	int merge;
	int update;
	int index_only;
	int nontrivial_merge;
	int trivial_merges_only;
	int verbose_update;
	int aggressive;
	int skip_unmerged;
	int gently;
	const char *prefix;
	int pos;
	struct dir_struct *dir;
	merge_fn_t fn;
 
	int head_idx;
	int merge_size;
 
	struct cache_entry *df_conflict_entry;
	void *unpack_data;
	struct index_state *index;
};
 
extern int unpack_trees(unsigned n, struct tree_desc *t,
		struct unpack_trees_options *options);
 
int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o, int);
int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
int bind_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
 
#endif