blame.c: Properly initialize strbuf after calling, textconv_object()
[git/dscho.git] / merge-recursive.h
blobb831293b3865ae52584565039e4a893c3c6f45ff
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 #include "string-list.h"
6 struct merge_options {
7 const char *ancestor;
8 const char *branch1;
9 const char *branch2;
10 enum {
11 MERGE_RECURSIVE_NORMAL = 0,
12 MERGE_RECURSIVE_OURS,
13 MERGE_RECURSIVE_THEIRS
14 } recursive_variant;
15 const char *subtree_shift;
16 unsigned buffer_output : 1;
17 int verbosity;
18 int diff_rename_limit;
19 int merge_rename_limit;
20 int call_depth;
21 struct strbuf obuf;
22 struct string_list current_file_set;
23 struct string_list current_directory_set;
26 /* Return a list of user-friendly error messages to be used by merge */
27 struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
29 /* merge_trees() but with recursive ancestor consolidation */
30 int merge_recursive(struct merge_options *o,
31 struct commit *h1,
32 struct commit *h2,
33 struct commit_list *ancestors,
34 struct commit **result);
36 /* rename-detecting three-way merge, no recursion */
37 int merge_trees(struct merge_options *o,
38 struct tree *head,
39 struct tree *merge,
40 struct tree *common,
41 struct tree **result);
44 * "git-merge-recursive" can be fed trees; wrap them into
45 * virtual commits and call merge_recursive() proper.
47 int merge_recursive_generic(struct merge_options *o,
48 const unsigned char *head,
49 const unsigned char *merge,
50 int num_ca,
51 const unsigned char **ca,
52 struct commit **result);
54 void init_merge_options(struct merge_options *o);
55 struct tree *write_tree_from_memory(struct merge_options *o);
57 /* builtin/merge.c */
58 int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
60 #endif