[thirdparty/git.git] / merge-recursive.h

#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

struct merge_options {
	const char *branch1;
	const char *branch2;
	unsigned subtree_merge : 1;
	unsigned buffer_output : 1;
	int verbosity;
	int diff_rename_limit;
	int merge_rename_limit;
};

/* merge_trees() but with recursive ancestor consolidation */
int merge_recursive(struct merge_options *o,
		    struct commit *h1,
		    struct commit *h2,
		    struct commit_list *ancestors,
		    struct commit **result);

/* rename-detecting three-way merge, no recursion */
int merge_trees(struct merge_options *o,
		struct tree *head,
		struct tree *merge,
		struct tree *common,
		struct tree **result);

/*
 * "git-merge-recursive" can be fed trees; wrap them into
 * virtual commits and call merge_recursive() proper.
 */
int merge_recursive_generic(struct merge_options *o,
			    const unsigned char *head,
			    const unsigned char *merge,
			    int num_ca,
			    const unsigned char **ca,
			    struct commit **result);

void init_merge_options(struct merge_options *o);
struct tree *write_tree_from_memory(struct merge_options *o);

#endif
Commit	Line	Data
e1b3a2ca DB	1	#ifndef MERGE_RECURSIVE_H
	2	#define MERGE_RECURSIVE_H
	3
8a2fce18 MV	4	struct merge_options {
	5	const char *branch1;
	6	const char *branch2;
	7	unsigned subtree_merge : 1;
	8	unsigned buffer_output : 1;
	9	int verbosity;
	10	int diff_rename_limit;
	11	int merge_rename_limit;
	12	};
	13
	14	/* merge_trees() but with recursive ancestor consolidation */
	15	int merge_recursive(struct merge_options *o,
	16	struct commit *h1,
e1b3a2ca	17	struct commit *h2,
e1b3a2ca DB	18	struct commit_list *ancestors,
	19	struct commit **result);
	20
8a2fce18 MV	21	/* rename-detecting three-way merge, no recursion */
	22	int merge_trees(struct merge_options *o,
	23	struct tree *head,
e1b3a2ca DB	24	struct tree *merge,
e1b3a2ca DB	25	struct tree *common,
e1b3a2ca	26	struct tree **result);
e1b3a2ca	27
8a2fce18 MV	28	/*
	29	* "git-merge-recursive" can be fed trees; wrap them into
	30	* virtual commits and call merge_recursive() proper.
	31	*/
	32	int merge_recursive_generic(struct merge_options *o,
	33	const unsigned char *head,
	34	const unsigned char *merge,
	35	int num_ca,
	36	const unsigned char **ca,
	37	struct commit **result);
	38
	39	void init_merge_options(struct merge_options *o);
	40	struct tree write_tree_from_memory(struct merge_options o);
9047ebbc	41
e1b3a2ca	42	#endif