[thirdparty/git.git] / unpack-trees.h

#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;
	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;
};

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
Commit	Line	Data
16da134b JS	1	#ifndef UNPACK_TREES_H
	2	#define UNPACK_TREES_H
	3
	4	struct unpack_trees_options;
	5
	6	typedef int (merge_fn_t)(struct cache_entry *src,
b48d5a05 LT	7	struct unpack_trees_options *options,
b48d5a05 LT	8	int remove);
16da134b JS	9
	10	struct 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;
	19	const char *prefix;
9a4d8fdc	20	int pos;
f8a9d428	21	struct dir_struct *dir;
16da134b JS	22	merge_fn_t fn;
	23
	24	int head_idx;
	25	int merge_size;
	26
	27	struct cache_entry *df_conflict_entry;
	28	};
	29
933bf40a	30	extern int unpack_trees(unsigned n, struct tree_desc *t,
16da134b JS	31	struct unpack_trees_options *options);
16da134b JS	32
b48d5a05 LT	33	int threeway_merge(struct cache_entry *stages, struct unpack_trees_options o, int);
	34	int twoway_merge(struct cache_entry *src, struct unpack_trees_options o, int);
	35	int bind_merge(struct cache_entry *src, struct unpack_trees_options o, int);
	36	int oneway_merge(struct cache_entry *src, struct unpack_trees_options o, int);
076b0adc	37
16da134b	38	#endif