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         unsigned subtree_merge : 1;
  10         unsigned buffer_output : 1;
  11         int verbosity;
  12         int diff_rename_limit;
  13         int merge_rename_limit;
  14         int call_depth;
  15         struct strbuf obuf;
  16         struct string_list current_file_set;
  17         struct string_list current_directory_set;
  18 };
  19
  20 /* merge_trees() but with recursive ancestor consolidation */
  21 int merge_recursive(struct merge_options *o,
  22                     struct commit *h1,
  23                     struct commit *h2,
  24                     struct commit_list *ancestors,
  25                     struct commit **result);
  26
  27 /* rename-detecting three-way merge, no recursion */
  28 int merge_trees(struct merge_options *o,
  29                 struct tree *head,
  30                 struct tree *merge,
  31                 struct tree *common,
  32                 struct tree **result);
  33
  34 /*
  35  * "git-merge-recursive" can be fed trees; wrap them into
  36  * virtual commits and call merge_recursive() proper.
  37  */
  38 int merge_recursive_generic(struct merge_options *o,
  39                             const unsigned char *head,
  40                             const unsigned char *merge,
  41                             int num_ca,
  42                             const unsigned char **ca,
  43                             struct commit **result);
  44
  45 void init_merge_options(struct merge_options *o);
  46 struct tree *write_tree_from_memory(struct merge_options *o);
  47
  48 #endif