merge-recursive.h

   1 #ifndef MERGE_RECURSIVE_H
   2 #define MERGE_RECURSIVE_H
   3
   4 #include "string-list.h"
   5
   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         unsigned renormalize : 1;
  18         long xdl_opts;
  19         int verbosity;
  20         int diff_rename_limit;
  21         int merge_rename_limit;
  22         int rename_score;
  23         int call_depth;
  24         struct strbuf obuf;
  25         struct string_list current_file_set;
  26         struct string_list current_directory_set;
  27 };
  28
  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);
  35
  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);
  42
  43 /*
  44  * "git-merge-recursive" can be fed trees; wrap them into
  45  * virtual commits and call merge_recursive() proper.
  46  */
  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);
  53
  54 void init_merge_options(struct merge_options *o);
  55 struct tree *write_tree_from_memory(struct merge_options *o);
  56
  57 int parse_merge_opt(struct merge_options *out, const char *s);
  58
  59 /* builtin/merge.c */
  60 int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
  61
  62 #endif