merge-ort-wrappers.c

   1 #include "cache.h"
   2 #include "gettext.h"
   3 #include "hash.h"
   4 #include "merge-ort.h"
   5 #include "merge-ort-wrappers.h"
   6
   7 #include "commit.h"
   8
   9 static int unclean(struct merge_options *opt, struct tree *head)
  10 {
  11         /* Sanity check on repo state; index must match head */
  12         struct strbuf sb = STRBUF_INIT;
  13
  14         if (head && repo_index_has_changes(opt->repo, head, &sb)) {
  15                 error(_("Your local changes to the following files would be overwritten by merge:\n  %s"),
  16                       sb.buf);
  17                 strbuf_release(&sb);
  18                 return -1;
  19         }
  20
  21         return 0;
  22 }
  23
  24 int merge_ort_nonrecursive(struct merge_options *opt,
  25                            struct tree *head,
  26                            struct tree *merge,
  27                            struct tree *merge_base)
  28 {
  29         struct merge_result result;
  30
  31         if (unclean(opt, head))
  32                 return -1;
  33
  34         if (oideq(&merge_base->object.oid, &merge->object.oid)) {
  35                 printf_ln(_("Already up to date."));
  36                 return 1;
  37         }
  38
  39         memset(&result, 0, sizeof(result));
  40         merge_incore_nonrecursive(opt, merge_base, head, merge, &result);
  41         merge_switch_to_result(opt, head, &result, 1, 1);
  42
  43         return result.clean;
  44 }
  45
  46 int merge_ort_recursive(struct merge_options *opt,
  47                         struct commit *side1,
  48                         struct commit *side2,
  49                         struct commit_list *merge_bases,
  50                         struct commit **result)
  51 {
  52         struct tree *head = repo_get_commit_tree(opt->repo, side1);
  53         struct merge_result tmp;
  54
  55         if (unclean(opt, head))
  56                 return -1;
  57
  58         memset(&tmp, 0, sizeof(tmp));
  59         merge_incore_recursive(opt, merge_bases, side1, side2, &tmp);
  60         merge_switch_to_result(opt, head, &tmp, 1, 1);
  61         *result = NULL;
  62
  63         return tmp.clean;
  64 }