2008-02-07 16:40:05 +00:00
|
|
|
#ifndef MERGE_RECURSIVE_H
|
|
|
|
#define MERGE_RECURSIVE_H
|
|
|
|
|
2008-09-03 17:08:56 +00:00
|
|
|
#include "string-list.h"
|
|
|
|
|
2008-08-25 14:25:57 +00:00
|
|
|
struct merge_options {
|
2010-03-21 00:41:38 +00:00
|
|
|
const char *ancestor;
|
2008-08-25 14:25:57 +00:00
|
|
|
const char *branch1;
|
|
|
|
const char *branch2;
|
2009-11-26 02:23:55 +00:00
|
|
|
enum {
|
2008-07-01 05:18:57 +00:00
|
|
|
MERGE_RECURSIVE_NORMAL = 0,
|
2009-11-26 02:23:55 +00:00
|
|
|
MERGE_RECURSIVE_OURS,
|
2010-05-14 09:31:35 +00:00
|
|
|
MERGE_RECURSIVE_THEIRS
|
2009-11-26 02:23:55 +00:00
|
|
|
} recursive_variant;
|
2008-07-01 05:18:57 +00:00
|
|
|
const char *subtree_shift;
|
2016-08-01 11:44:50 +00:00
|
|
|
unsigned buffer_output; /* 1: output at end, 2: keep buffered */
|
2010-08-05 11:15:32 +00:00
|
|
|
unsigned renormalize : 1;
|
2010-08-26 05:50:45 +00:00
|
|
|
long xdl_opts;
|
2008-08-25 14:25:57 +00:00
|
|
|
int verbosity;
|
2016-02-17 03:15:25 +00:00
|
|
|
int detect_rename;
|
2008-08-25 14:25:57 +00:00
|
|
|
int diff_rename_limit;
|
|
|
|
int merge_rename_limit;
|
2010-09-27 23:58:25 +00:00
|
|
|
int rename_score;
|
2011-02-19 10:20:51 +00:00
|
|
|
int needed_rename_limit;
|
2011-02-20 09:53:21 +00:00
|
|
|
int show_rename_progress;
|
2008-09-02 21:30:09 +00:00
|
|
|
int call_depth;
|
2008-09-03 00:30:03 +00:00
|
|
|
struct strbuf obuf;
|
2017-09-07 16:25:56 +00:00
|
|
|
struct hashmap current_file_dir_set;
|
2011-08-12 05:19:58 +00:00
|
|
|
struct string_list df_conflict_file_set;
|
2018-02-14 18:51:57 +00:00
|
|
|
};
|
|
|
|
|
2008-08-25 14:25:57 +00:00
|
|
|
/* merge_trees() but with recursive ancestor consolidation */
|
|
|
|
int merge_recursive(struct merge_options *o,
|
|
|
|
struct commit *h1,
|
2008-02-07 16:40:05 +00:00
|
|
|
struct commit *h2,
|
|
|
|
struct commit_list *ancestors,
|
|
|
|
struct commit **result);
|
|
|
|
|
2008-08-25 14:25:57 +00:00
|
|
|
/* rename-detecting three-way merge, no recursion */
|
|
|
|
int merge_trees(struct merge_options *o,
|
|
|
|
struct tree *head,
|
2008-02-07 16:40:05 +00:00
|
|
|
struct tree *merge,
|
|
|
|
struct tree *common,
|
|
|
|
struct tree **result);
|
|
|
|
|
2008-08-25 14:25:57 +00: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,
|
2016-06-24 23:09:28 +00:00
|
|
|
const struct object_id *head,
|
|
|
|
const struct object_id *merge,
|
2008-08-25 14:25:57 +00:00
|
|
|
int num_ca,
|
2016-06-24 23:09:28 +00:00
|
|
|
const struct object_id **ca,
|
2008-08-25 14:25:57 +00:00
|
|
|
struct commit **result);
|
|
|
|
|
|
|
|
void init_merge_options(struct merge_options *o);
|
|
|
|
struct tree *write_tree_from_memory(struct merge_options *o);
|
2008-08-12 16:45:14 +00:00
|
|
|
|
2010-08-26 05:47:58 +00:00
|
|
|
int parse_merge_opt(struct merge_options *out, const char *s);
|
|
|
|
|
2008-02-07 16:40:05 +00:00
|
|
|
#endif
|