git.oblomov.eu Git - git/blob - 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 *branch1;
   8         const char *branch2;
   9         enum {
  10                 MERGE_RECURSIVE_NORMAL = 0,
  11                 MERGE_RECURSIVE_OURS,
  12                 MERGE_RECURSIVE_THEIRS,
  13         } recursive_variant;
  14         const char *subtree_shift;
  15         unsigned buffer_output : 1;
  16         int verbosity;
  17         int diff_rename_limit;
  18         int merge_rename_limit;
  19         int call_depth;
  20         struct strbuf obuf;
  21         struct string_list current_file_set;
  22         struct string_list current_directory_set;
  23 };
  24
  25 /* Return a list of user-friendly error messages to be used by merge */
  26 struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
  27
  28 /* merge_trees() but with recursive ancestor consolidation */
  29 int merge_recursive(struct merge_options *o,
  30                     struct commit *h1,
  31                     struct commit *h2,
  32                     struct commit_list *ancestors,
  33                     struct commit **result);
  34
  35 /* rename-detecting three-way merge, no recursion */
  36 int merge_trees(struct merge_options *o,
  37                 struct tree *head,
  38                 struct tree *merge,
  39                 struct tree *common,
  40                 struct tree **result);
  41
  42 /*
  43  * "git-merge-recursive" can be fed trees; wrap them into
  44  * virtual commits and call merge_recursive() proper.
  45  */
  46 int merge_recursive_generic(struct merge_options *o,
  47                             const unsigned char *head,
  48                             const unsigned char *merge,
  49                             int num_ca,
  50                             const unsigned char **ca,
  51                             struct commit **result);
  52
  53 void init_merge_options(struct merge_options *o);
  54 struct tree *write_tree_from_memory(struct merge_options *o);
  55
  56 #endif