2008-02-07 17:40:05 +01:00
|
|
|
#ifndef MERGE_RECURSIVE_H
|
|
|
|
#define MERGE_RECURSIVE_H
|
|
|
|
|
2008-09-03 19:08:56 +02:00
|
|
|
#include "string-list.h"
|
|
|
|
|
2008-08-25 16:25:57 +02:00
|
|
|
struct merge_options {
|
|
|
|
const char *branch1;
|
|
|
|
const char *branch2;
|
2009-11-26 03:23:55 +01:00
|
|
|
enum {
|
|
|
|
MERGE_RECURSIVE_SUBTREE = 1,
|
|
|
|
MERGE_RECURSIVE_OURS,
|
|
|
|
MERGE_RECURSIVE_THEIRS,
|
|
|
|
} recursive_variant;
|
2008-08-25 16:25:57 +02:00
|
|
|
unsigned buffer_output : 1;
|
|
|
|
int verbosity;
|
|
|
|
int diff_rename_limit;
|
|
|
|
int merge_rename_limit;
|
2008-09-02 23:30:09 +02:00
|
|
|
int call_depth;
|
2008-09-03 02:30:03 +02:00
|
|
|
struct strbuf obuf;
|
2008-09-03 19:08:56 +02:00
|
|
|
struct string_list current_file_set;
|
|
|
|
struct string_list current_directory_set;
|
2008-08-25 16:25:57 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* merge_trees() but with recursive ancestor consolidation */
|
|
|
|
int merge_recursive(struct merge_options *o,
|
|
|
|
struct commit *h1,
|
2008-02-07 17:40:05 +01:00
|
|
|
struct commit *h2,
|
|
|
|
struct commit_list *ancestors,
|
|
|
|
struct commit **result);
|
|
|
|
|
2008-08-25 16:25:57 +02:00
|
|
|
/* rename-detecting three-way merge, no recursion */
|
|
|
|
int merge_trees(struct merge_options *o,
|
|
|
|
struct tree *head,
|
2008-02-07 17:40:05 +01:00
|
|
|
struct tree *merge,
|
|
|
|
struct tree *common,
|
|
|
|
struct tree **result);
|
|
|
|
|
2008-08-25 16:25:57 +02:00
|
|
|
/*
|
|
|
|
* "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);
|
2008-08-12 18:45:14 +02:00
|
|
|
|
2008-02-07 17:40:05 +01:00
|
|
|
#endif
|