builtin/merge-recursive.c

   1 #define USE_THE_REPOSITORY_VARIABLE
   2 #include "builtin.h"
   3 #include "advice.h"
   4 #include "gettext.h"
   5 #include "hash.h"
   6 #include "merge-recursive.h"
   7 #include "object-name.h"
   8
   9 static const char builtin_merge_recursive_usage[] =
  10         "git %s <base>... -- <head> <remote> ...";
  11
  12 static char *better_branch_name(const char *branch)
  13 {
  14         static char githead_env[8 + GIT_MAX_HEXSZ + 1];
  15         char *name;
  16
  17         if (strlen(branch) != the_hash_algo->hexsz)
  18                 return xstrdup(branch);
  19         xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch);
  20         name = getenv(githead_env);
  21         return xstrdup(name ? name : branch);
  22 }
  23
  24 int cmd_merge_recursive(int argc,
  25                         const char **argv,
  26                         const char *prefix UNUSED,
  27                         struct repository *repo UNUSED)
  28 {
  29         struct object_id bases[21];
  30         unsigned bases_count = 0;
  31         int i, failed;
  32         struct object_id h1, h2;
  33         struct merge_options o;
  34         char *better1, *better2;
  35         struct commit *result;
  36
  37         init_basic_merge_options(&o, the_repository);
  38         if (argv[0] && ends_with(argv[0], "-subtree"))
  39                 o.subtree_shift = "";
  40
  41         if (argc < 4)
  42                 usagef(builtin_merge_recursive_usage, argv[0]);
  43
  44         for (i = 1; i < argc; ++i) {
  45                 const char *arg = argv[i];
  46
  47                 if (starts_with(arg, "--")) {
  48                         if (!arg[2])
  49                                 break;
  50                         if (parse_merge_opt(&o, arg + 2))
  51                                 die(_("unknown option %s"), arg);
  52                         continue;
  53                 }
  54                 if (bases_count < ARRAY_SIZE(bases)-1) {
  55                         if (repo_get_oid(the_repository, argv[i], &bases[bases_count++]))
  56                                 die(_("could not parse object '%s'"), argv[i]);
  57                 }
  58                 else
  59                         warning(Q_("cannot handle more than %d base. "
  60                                    "Ignoring %s.",
  61                                    "cannot handle more than %d bases. "
  62                                    "Ignoring %s.",
  63                                     ARRAY_SIZE(bases)-1),
  64                                 (int)ARRAY_SIZE(bases)-1, argv[i]);
  65         }
  66         if (argc - i != 3) /* "--" "<head>" "<remote>" */
  67                 die(_("not handling anything other than two heads merge."));
  68
  69         if (repo_read_index_unmerged(the_repository))
  70                 die_resolve_conflict("merge");
  71
  72         o.branch1 = argv[++i];
  73         o.branch2 = argv[++i];
  74
  75         if (repo_get_oid(the_repository, o.branch1, &h1))
  76                 die(_("could not resolve ref '%s'"), o.branch1);
  77         if (repo_get_oid(the_repository, o.branch2, &h2))
  78                 die(_("could not resolve ref '%s'"), o.branch2);
  79
  80         o.branch1 = better1 = better_branch_name(o.branch1);
  81         o.branch2 = better2 = better_branch_name(o.branch2);
  82
  83         if (o.verbosity >= 3)
  84                 printf(_("Merging %s with %s\n"), o.branch1, o.branch2);
  85
  86         failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
  87
  88         free(better1);
  89         free(better2);
  90
  91         if (failed < 0)
  92                 return 128; /* die() error code */
  93         return failed;
  94 }