git.oblomov.eu Git - git/blob - builtin/merge.c

   1 /*
   2  * Builtin "git merge"
   3  *
   4  * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
   5  *
   6  * Based on git-merge.sh by Junio C Hamano.
   7  */
   8
   9 #include "cache.h"
  10 #include "parse-options.h"
  11 #include "builtin.h"
  12 #include "lockfile.h"
  13 #include "run-command.h"
  14 #include "diff.h"
  15 #include "refs.h"
  16 #include "commit.h"
  17 #include "diffcore.h"
  18 #include "revision.h"
  19 #include "unpack-trees.h"
  20 #include "cache-tree.h"
  21 #include "dir.h"
  22 #include "utf8.h"
  23 #include "log-tree.h"
  24 #include "color.h"
  25 #include "rerere.h"
  26 #include "help.h"
  27 #include "merge-recursive.h"
  28 #include "resolve-undo.h"
  29 #include "remote.h"
  30 #include "fmt-merge-msg.h"
  31 #include "gpg-interface.h"
  32 #include "sequencer.h"
  33 #include "string-list.h"
  34
  35 #define DEFAULT_TWOHEAD (1<<0)
  36 #define DEFAULT_OCTOPUS (1<<1)
  37 #define NO_FAST_FORWARD (1<<2)
  38 #define NO_TRIVIAL      (1<<3)
  39
  40 struct strategy {
  41         const char *name;
  42         unsigned attr;
  43 };
  44
  45 static const char * const builtin_merge_usage[] = {
  46         N_("git merge [<options>] [<commit>...]"),
  47         N_("git merge --abort"),
  48         NULL
  49 };
  50
  51 static int show_diffstat = 1, shortlog_len = -1, squash;
  52 static int option_commit = 1;
  53 static int option_edit = -1;
  54 static int allow_trivial = 1, have_message, verify_signatures;
  55 static int overwrite_ignore = 1;
  56 static struct strbuf merge_msg = STRBUF_INIT;
  57 static struct strategy **use_strategies;
  58 static size_t use_strategies_nr, use_strategies_alloc;
  59 static const char **xopts;
  60 static size_t xopts_nr, xopts_alloc;
  61 static const char *branch;
  62 static char *branch_mergeoptions;
  63 static int option_renormalize;
  64 static int verbosity;
  65 static int allow_rerere_auto;
  66 static int abort_current_merge;
  67 static int allow_unrelated_histories;
  68 static int show_progress = -1;
  69 static int default_to_upstream = 1;
  70 static const char *sign_commit;
  71
  72 static struct strategy all_strategy[] = {
  73         { "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
  74         { "octopus",    DEFAULT_OCTOPUS },
  75         { "resolve",    0 },
  76         { "ours",       NO_FAST_FORWARD | NO_TRIVIAL },
  77         { "subtree",    NO_FAST_FORWARD | NO_TRIVIAL },
  78 };
  79
  80 static const char *pull_twohead, *pull_octopus;
  81
  82 enum ff_type {
  83         FF_NO,
  84         FF_ALLOW,
  85         FF_ONLY
  86 };
  87
  88 static enum ff_type fast_forward = FF_ALLOW;
  89
  90 static int option_parse_message(const struct option *opt,
  91                                 const char *arg, int unset)
  92 {
  93         struct strbuf *buf = opt->value;
  94
  95         if (unset)
  96                 strbuf_setlen(buf, 0);
  97         else if (arg) {
  98                 strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg);
  99                 have_message = 1;
 100         } else
 101                 return error(_("switch `m' requires a value"));
 102         return 0;
 103 }
 104
 105 static struct strategy *get_strategy(const char *name)
 106 {
 107         int i;
 108         struct strategy *ret;
 109         static struct cmdnames main_cmds, other_cmds;
 110         static int loaded;
 111
 112         if (!name)
 113                 return NULL;
 114
 115         for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
 116                 if (!strcmp(name, all_strategy[i].name))
 117                         return &all_strategy[i];
 118
 119         if (!loaded) {
 120                 struct cmdnames not_strategies;
 121                 loaded = 1;
 122
 123                 memset(&not_strategies, 0, sizeof(struct cmdnames));
 124                 load_command_list("git-merge-", &main_cmds, &other_cmds);
 125                 for (i = 0; i < main_cmds.cnt; i++) {
 126                         int j, found = 0;
 127                         struct cmdname *ent = main_cmds.names[i];
 128                         for (j = 0; j < ARRAY_SIZE(all_strategy); j++)
 129                                 if (!strncmp(ent->name, all_strategy[j].name, ent->len)
 130                                                 && !all_strategy[j].name[ent->len])
 131                                         found = 1;
 132                         if (!found)
 133                                 add_cmdname(&not_strategies, ent->name, ent->len);
 134                 }
 135                 exclude_cmds(&main_cmds, &not_strategies);
 136         }
 137         if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
 138                 fprintf(stderr, _("Could not find merge strategy '%s'.\n"), name);
 139                 fprintf(stderr, _("Available strategies are:"));
 140                 for (i = 0; i < main_cmds.cnt; i++)
 141                         fprintf(stderr, " %s", main_cmds.names[i]->name);
 142                 fprintf(stderr, ".\n");
 143                 if (other_cmds.cnt) {
 144                         fprintf(stderr, _("Available custom strategies are:"));
 145                         for (i = 0; i < other_cmds.cnt; i++)
 146                                 fprintf(stderr, " %s", other_cmds.names[i]->name);
 147                         fprintf(stderr, ".\n");
 148                 }
 149                 exit(1);
 150         }
 151
 152         ret = xcalloc(1, sizeof(struct strategy));
 153         ret->name = xstrdup(name);
 154         ret->attr = NO_TRIVIAL;
 155         return ret;
 156 }
 157
 158 static void append_strategy(struct strategy *s)
 159 {
 160         ALLOC_GROW(use_strategies, use_strategies_nr + 1, use_strategies_alloc);
 161         use_strategies[use_strategies_nr++] = s;
 162 }
 163
 164 static int option_parse_strategy(const struct option *opt,
 165                                  const char *name, int unset)
 166 {
 167         if (unset)
 168                 return 0;
 169
 170         append_strategy(get_strategy(name));
 171         return 0;
 172 }
 173
 174 static int option_parse_x(const struct option *opt,
 175                           const char *arg, int unset)
 176 {
 177         if (unset)
 178                 return 0;
 179
 180         ALLOC_GROW(xopts, xopts_nr + 1, xopts_alloc);
 181         xopts[xopts_nr++] = xstrdup(arg);
 182         return 0;
 183 }
 184
 185 static int option_parse_n(const struct option *opt,
 186                           const char *arg, int unset)
 187 {
 188         show_diffstat = unset;
 189         return 0;
 190 }
 191
 192 static struct option builtin_merge_options[] = {
 193         { OPTION_CALLBACK, 'n', NULL, NULL, NULL,
 194                 N_("do not show a diffstat at the end of the merge"),
 195                 PARSE_OPT_NOARG, option_parse_n },
 196         OPT_BOOL(0, "stat", &show_diffstat,
 197                 N_("show a diffstat at the end of the merge")),
 198         OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
 199         { OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
 200           N_("add (at most <n>) entries from shortlog to merge commit message"),
 201           PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
 202         OPT_BOOL(0, "squash", &squash,
 203                 N_("create a single commit instead of doing a merge")),
 204         OPT_BOOL(0, "commit", &option_commit,
 205                 N_("perform a commit if the merge succeeds (default)")),
 206         OPT_BOOL('e', "edit", &option_edit,
 207                 N_("edit message before committing")),
 208         OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW),
 209         { OPTION_SET_INT, 0, "ff-only", &fast_forward, NULL,
 210                 N_("abort if fast-forward is not possible"),
 211                 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
 212         OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
 213         OPT_BOOL(0, "verify-signatures", &verify_signatures,
 214                 N_("verify that the named commit has a valid GPG signature")),
 215         OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
 216                 N_("merge strategy to use"), option_parse_strategy),
 217         OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),
 218                 N_("option for selected merge strategy"), option_parse_x),
 219         OPT_CALLBACK('m', "message", &merge_msg, N_("message"),
 220                 N_("merge commit message (for a non-fast-forward merge)"),
 221                 option_parse_message),
 222         OPT__VERBOSITY(&verbosity),
 223         OPT_BOOL(0, "abort", &abort_current_merge,
 224                 N_("abort the current in-progress merge")),
 225         OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
 226                  N_("allow merging unrelated histories")),
 227         OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
 228         { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
 229           N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 230         OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
 231         OPT_END()
 232 };
 233
 234 /* Cleans up metadata that is uninteresting after a succeeded merge. */
 235 static void drop_save(void)
 236 {
 237         unlink(git_path_merge_head());
 238         unlink(git_path_merge_msg());
 239         unlink(git_path_merge_mode());
 240 }
 241
 242 static int save_state(unsigned char *stash)
 243 {
 244         int len;
 245         struct child_process cp = CHILD_PROCESS_INIT;
 246         struct strbuf buffer = STRBUF_INIT;
 247         const char *argv[] = {"stash", "create", NULL};
 248
 249         cp.argv = argv;
 250         cp.out = -1;
 251         cp.git_cmd = 1;
 252
 253         if (start_command(&cp))
 254                 die(_("could not run stash."));
 255         len = strbuf_read(&buffer, cp.out, 1024);
 256         close(cp.out);
 257
 258         if (finish_command(&cp) || len < 0)
 259                 die(_("stash failed"));
 260         else if (!len)          /* no changes */
 261                 return -1;
 262         strbuf_setlen(&buffer, buffer.len-1);
 263         if (get_sha1(buffer.buf, stash))
 264                 die(_("not a valid object: %s"), buffer.buf);
 265         return 0;
 266 }
 267
 268 static void read_empty(unsigned const char *sha1, int verbose)
 269 {
 270         int i = 0;
 271         const char *args[7];
 272
 273         args[i++] = "read-tree";
 274         if (verbose)
 275                 args[i++] = "-v";
 276         args[i++] = "-m";
 277         args[i++] = "-u";
 278         args[i++] = EMPTY_TREE_SHA1_HEX;
 279         args[i++] = sha1_to_hex(sha1);
 280         args[i] = NULL;
 281
 282         if (run_command_v_opt(args, RUN_GIT_CMD))
 283                 die(_("read-tree failed"));
 284 }
 285
 286 static void reset_hard(unsigned const char *sha1, int verbose)
 287 {
 288         int i = 0;
 289         const char *args[6];
 290
 291         args[i++] = "read-tree";
 292         if (verbose)
 293                 args[i++] = "-v";
 294         args[i++] = "--reset";
 295         args[i++] = "-u";
 296         args[i++] = sha1_to_hex(sha1);
 297         args[i] = NULL;
 298
 299         if (run_command_v_opt(args, RUN_GIT_CMD))
 300                 die(_("read-tree failed"));
 301 }
 302
 303 static void restore_state(const unsigned char *head,
 304                           const unsigned char *stash)
 305 {
 306         struct strbuf sb = STRBUF_INIT;
 307         const char *args[] = { "stash", "apply", NULL, NULL };
 308
 309         if (is_null_sha1(stash))
 310                 return;
 311
 312         reset_hard(head, 1);
 313
 314         args[2] = sha1_to_hex(stash);
 315
 316         /*
 317          * It is OK to ignore error here, for example when there was
 318          * nothing to restore.
 319          */
 320         run_command_v_opt(args, RUN_GIT_CMD);
 321
 322         strbuf_release(&sb);
 323         refresh_cache(REFRESH_QUIET);
 324 }
 325
 326 /* This is called when no merge was necessary. */
 327 static void finish_up_to_date(const char *msg)
 328 {
 329         if (verbosity >= 0)
 330                 printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
 331         drop_save();
 332 }
 333
 334 static void squash_message(struct commit *commit, struct commit_list *remoteheads)
 335 {
 336         struct rev_info rev;
 337         struct strbuf out = STRBUF_INIT;
 338         struct commit_list *j;
 339         struct pretty_print_context ctx = {0};
 340
 341         printf(_("Squash commit -- not updating HEAD\n"));
 342
 343         init_revisions(&rev, NULL);
 344         rev.ignore_merges = 1;
 345         rev.commit_format = CMIT_FMT_MEDIUM;
 346
 347         commit->object.flags |= UNINTERESTING;
 348         add_pending_object(&rev, &commit->object, NULL);
 349
 350         for (j = remoteheads; j; j = j->next)
 351                 add_pending_object(&rev, &j->item->object, NULL);
 352
 353         setup_revisions(0, NULL, &rev, NULL);
 354         if (prepare_revision_walk(&rev))
 355                 die(_("revision walk setup failed"));
 356
 357         ctx.abbrev = rev.abbrev;
 358         ctx.date_mode = rev.date_mode;
 359         ctx.fmt = rev.commit_format;
 360
 361         strbuf_addstr(&out, "Squashed commit of the following:\n");
 362         while ((commit = get_revision(&rev)) != NULL) {
 363                 strbuf_addch(&out, '\n');
 364                 strbuf_addf(&out, "commit %s\n",
 365                         oid_to_hex(&commit->object.oid));
 366                 pretty_print_commit(&ctx, commit, &out);
 367         }
 368         write_file_buf(git_path_squash_msg(), out.buf, out.len);
 369         strbuf_release(&out);
 370 }
 371
 372 static void finish(struct commit *head_commit,
 373                    struct commit_list *remoteheads,
 374                    const unsigned char *new_head, const char *msg)
 375 {
 376         struct strbuf reflog_message = STRBUF_INIT;
 377         const unsigned char *head = head_commit->object.oid.hash;
 378
 379         if (!msg)
 380                 strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION"));
 381         else {
 382                 if (verbosity >= 0)
 383                         printf("%s\n", msg);
 384                 strbuf_addf(&reflog_message, "%s: %s",
 385                         getenv("GIT_REFLOG_ACTION"), msg);
 386         }
 387         if (squash) {
 388                 squash_message(head_commit, remoteheads);
 389         } else {
 390                 if (verbosity >= 0 && !merge_msg.len)
 391                         printf(_("No merge message -- not updating HEAD\n"));
 392                 else {
 393                         const char *argv_gc_auto[] = { "gc", "--auto", NULL };
 394                         update_ref(reflog_message.buf, "HEAD",
 395                                 new_head, head, 0,
 396                                 UPDATE_REFS_DIE_ON_ERR);
 397                         /*
 398                          * We ignore errors in 'gc --auto', since the
 399                          * user should see them.
 400                          */
 401                         close_all_packs();
 402                         run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
 403                 }
 404         }
 405         if (new_head && show_diffstat) {
 406                 struct diff_options opts;
 407                 diff_setup(&opts);
 408                 opts.stat_width = -1; /* use full terminal width */
 409                 opts.stat_graph_width = -1; /* respect statGraphWidth config */
 410                 opts.output_format |=
 411                         DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
 412                 opts.detect_rename = DIFF_DETECT_RENAME;
 413                 diff_setup_done(&opts);
 414                 diff_tree_sha1(head, new_head, "", &opts);
 415                 diffcore_std(&opts);
 416                 diff_flush(&opts);
 417         }
 418
 419         /* Run a post-merge hook */
 420         run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
 421
 422         strbuf_release(&reflog_message);
 423 }
 424
 425 /* Get the name for the merge commit's message. */
 426 static void merge_name(const char *remote, struct strbuf *msg)
 427 {
 428         struct commit *remote_head;
 429         unsigned char branch_head[20];
 430         struct strbuf buf = STRBUF_INIT;
 431         struct strbuf bname = STRBUF_INIT;
 432         const char *ptr;
 433         char *found_ref;
 434         int len, early;
 435
 436         strbuf_branchname(&bname, remote);
 437         remote = bname.buf;
 438
 439         memset(branch_head, 0, sizeof(branch_head));
 440         remote_head = get_merge_parent(remote);
 441         if (!remote_head)
 442                 die(_("'%s' does not point to a commit"), remote);
 443
 444         if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) {
 445                 if (starts_with(found_ref, "refs/heads/")) {
 446                         strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
 447                                     sha1_to_hex(branch_head), remote);
 448                         goto cleanup;
 449                 }
 450                 if (starts_with(found_ref, "refs/tags/")) {
 451                         strbuf_addf(msg, "%s\t\ttag '%s' of .\n",
 452                                     sha1_to_hex(branch_head), remote);
 453                         goto cleanup;
 454                 }
 455                 if (starts_with(found_ref, "refs/remotes/")) {
 456                         strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
 457                                     sha1_to_hex(branch_head), remote);
 458                         goto cleanup;
 459                 }
 460         }
 461
 462         /* See if remote matches <name>^^^.. or <name>~<number> */
 463         for (len = 0, ptr = remote + strlen(remote);
 464              remote < ptr && ptr[-1] == '^';
 465              ptr--)
 466                 len++;
 467         if (len)
 468                 early = 1;
 469         else {
 470                 early = 0;
 471                 ptr = strrchr(remote, '~');
 472                 if (ptr) {
 473                         int seen_nonzero = 0;
 474
 475                         len++; /* count ~ */
 476                         while (*++ptr && isdigit(*ptr)) {
 477                                 seen_nonzero |= (*ptr != '0');
 478                                 len++;
 479                         }
 480                         if (*ptr)
 481                                 len = 0; /* not ...~<number> */
 482                         else if (seen_nonzero)
 483                                 early = 1;
 484                         else if (len == 1)
 485                                 early = 1; /* "name~" is "name~1"! */
 486                 }
 487         }
 488         if (len) {
 489                 struct strbuf truname = STRBUF_INIT;
 490                 strbuf_addf(&truname, "refs/heads/%s", remote);
 491                 strbuf_setlen(&truname, truname.len - len);
 492                 if (ref_exists(truname.buf)) {
 493                         strbuf_addf(msg,
 494                                     "%s\t\tbranch '%s'%s of .\n",
 495                                     oid_to_hex(&remote_head->object.oid),
 496                                     truname.buf + 11,
 497                                     (early ? " (early part)" : ""));
 498                         strbuf_release(&truname);
 499                         goto cleanup;
 500                 }
 501                 strbuf_release(&truname);
 502         }
 503
 504         if (remote_head->util) {
 505                 struct merge_remote_desc *desc;
 506                 desc = merge_remote_util(remote_head);
 507                 if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
 508                         strbuf_addf(msg, "%s\t\t%s '%s'\n",
 509                                     oid_to_hex(&desc->obj->oid),
 510                                     typename(desc->obj->type),
 511                                     remote);
 512                         goto cleanup;
 513                 }
 514         }
 515
 516         strbuf_addf(msg, "%s\t\tcommit '%s'\n",
 517                 oid_to_hex(&remote_head->object.oid), remote);
 518 cleanup:
 519         strbuf_release(&buf);
 520         strbuf_release(&bname);
 521 }
 522
 523 static void parse_branch_merge_options(char *bmo)
 524 {
 525         const char **argv;
 526         int argc;
 527
 528         if (!bmo)
 529                 return;
 530         argc = split_cmdline(bmo, &argv);
 531         if (argc < 0)
 532                 die(_("Bad branch.%s.mergeoptions string: %s"), branch,
 533                     split_cmdline_strerror(argc));
 534         REALLOC_ARRAY(argv, argc + 2);
 535         memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
 536         argc++;
 537         argv[0] = "branch.*.mergeoptions";
 538         parse_options(argc, argv, NULL, builtin_merge_options,
 539                       builtin_merge_usage, 0);
 540         free(argv);
 541 }
 542
 543 static int git_merge_config(const char *k, const char *v, void *cb)
 544 {
 545         int status;
 546
 547         if (branch && starts_with(k, "branch.") &&
 548                 starts_with(k + 7, branch) &&
 549                 !strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
 550                 free(branch_mergeoptions);
 551                 branch_mergeoptions = xstrdup(v);
 552                 return 0;
 553         }
 554
 555         if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
 556                 show_diffstat = git_config_bool(k, v);
 557         else if (!strcmp(k, "pull.twohead"))
 558                 return git_config_string(&pull_twohead, k, v);
 559         else if (!strcmp(k, "pull.octopus"))
 560                 return git_config_string(&pull_octopus, k, v);
 561         else if (!strcmp(k, "merge.renormalize"))
 562                 option_renormalize = git_config_bool(k, v);
 563         else if (!strcmp(k, "merge.ff")) {
 564                 int boolval = git_config_maybe_bool(k, v);
 565                 if (0 <= boolval) {
 566                         fast_forward = boolval ? FF_ALLOW : FF_NO;
 567                 } else if (v && !strcmp(v, "only")) {
 568                         fast_forward = FF_ONLY;
 569                 } /* do not barf on values from future versions of git */
 570                 return 0;
 571         } else if (!strcmp(k, "merge.defaulttoupstream")) {
 572                 default_to_upstream = git_config_bool(k, v);
 573                 return 0;
 574         } else if (!strcmp(k, "commit.gpgsign")) {
 575                 sign_commit = git_config_bool(k, v) ? "" : NULL;
 576                 return 0;
 577         }
 578
 579         status = fmt_merge_msg_config(k, v, cb);
 580         if (status)
 581                 return status;
 582         status = git_gpg_config(k, v, NULL);
 583         if (status)
 584                 return status;
 585         return git_diff_ui_config(k, v, cb);
 586 }
 587
 588 static int read_tree_trivial(unsigned char *common, unsigned char *head,
 589                              unsigned char *one)
 590 {
 591         int i, nr_trees = 0;
 592         struct tree *trees[MAX_UNPACK_TREES];
 593         struct tree_desc t[MAX_UNPACK_TREES];
 594         struct unpack_trees_options opts;
 595
 596         memset(&opts, 0, sizeof(opts));
 597         opts.head_idx = 2;
 598         opts.src_index = &the_index;
 599         opts.dst_index = &the_index;
 600         opts.update = 1;
 601         opts.verbose_update = 1;
 602         opts.trivial_merges_only = 1;
 603         opts.merge = 1;
 604         trees[nr_trees] = parse_tree_indirect(common);
 605         if (!trees[nr_trees++])
 606                 return -1;
 607         trees[nr_trees] = parse_tree_indirect(head);
 608         if (!trees[nr_trees++])
 609                 return -1;
 610         trees[nr_trees] = parse_tree_indirect(one);
 611         if (!trees[nr_trees++])
 612                 return -1;
 613         opts.fn = threeway_merge;
 614         cache_tree_free(&active_cache_tree);
 615         for (i = 0; i < nr_trees; i++) {
 616                 parse_tree(trees[i]);
 617                 init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
 618         }
 619         if (unpack_trees(nr_trees, t, &opts))
 620                 return -1;
 621         return 0;
 622 }
 623
 624 static void write_tree_trivial(unsigned char *sha1)
 625 {
 626         if (write_cache_as_tree(sha1, 0, NULL))
 627                 die(_("git write-tree failed to write a tree"));
 628 }
 629
 630 static int try_merge_strategy(const char *strategy, struct commit_list *common,
 631                               struct commit_list *remoteheads,
 632                               struct commit *head)
 633 {
 634         static struct lock_file lock;
 635         const char *head_arg = "HEAD";
 636
 637         hold_locked_index(&lock, 1);
 638         refresh_cache(REFRESH_QUIET);
 639         if (active_cache_changed &&
 640             write_locked_index(&the_index, &lock, COMMIT_LOCK))
 641                 return error(_("Unable to write index."));
 642         rollback_lock_file(&lock);
 643
 644         if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
 645                 int clean, x;
 646                 struct commit *result;
 647                 struct commit_list *reversed = NULL;
 648                 struct merge_options o;
 649                 struct commit_list *j;
 650
 651                 if (remoteheads->next) {
 652                         error(_("Not handling anything other than two heads merge."));
 653                         return 2;
 654                 }
 655
 656                 init_merge_options(&o);
 657                 if (!strcmp(strategy, "subtree"))
 658                         o.subtree_shift = "";
 659
 660                 o.renormalize = option_renormalize;
 661                 o.show_rename_progress =
 662                         show_progress == -1 ? isatty(2) : show_progress;
 663
 664                 for (x = 0; x < xopts_nr; x++)
 665                         if (parse_merge_opt(&o, xopts[x]))
 666                                 die(_("Unknown option for merge-recursive: -X%s"), xopts[x]);
 667
 668                 o.branch1 = head_arg;
 669                 o.branch2 = merge_remote_util(remoteheads->item)->name;
 670
 671                 for (j = common; j; j = j->next)
 672                         commit_list_insert(j->item, &reversed);
 673
 674                 hold_locked_index(&lock, 1);
 675                 clean = merge_recursive(&o, head,
 676                                 remoteheads->item, reversed, &result);
 677                 if (clean < 0)
 678                         exit(128);
 679                 if (active_cache_changed &&
 680                     write_locked_index(&the_index, &lock, COMMIT_LOCK))
 681                         die (_("unable to write %s"), get_index_file());
 682                 rollback_lock_file(&lock);
 683                 return clean ? 0 : 1;
 684         } else {
 685                 return try_merge_command(strategy, xopts_nr, xopts,
 686                                                 common, head_arg, remoteheads);
 687         }
 688 }
 689
 690 static void count_diff_files(struct diff_queue_struct *q,
 691                              struct diff_options *opt, void *data)
 692 {
 693         int *count = data;
 694
 695         (*count) += q->nr;
 696 }
 697
 698 static int count_unmerged_entries(void)
 699 {
 700         int i, ret = 0;
 701
 702         for (i = 0; i < active_nr; i++)
 703                 if (ce_stage(active_cache[i]))
 704                         ret++;
 705
 706         return ret;
 707 }
 708
 709 static void add_strategies(const char *string, unsigned attr)
 710 {
 711         int i;
 712
 713         if (string) {
 714                 struct string_list list = STRING_LIST_INIT_DUP;
 715                 struct string_list_item *item;
 716                 string_list_split(&list, string, ' ', -1);
 717                 for_each_string_list_item(item, &list)
 718                         append_strategy(get_strategy(item->string));
 719                 string_list_clear(&list, 0);
 720                 return;
 721         }
 722         for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
 723                 if (all_strategy[i].attr & attr)
 724                         append_strategy(&all_strategy[i]);
 725
 726 }
 727
 728 static void read_merge_msg(struct strbuf *msg)
 729 {
 730         const char *filename = git_path_merge_msg();
 731         strbuf_reset(msg);
 732         if (strbuf_read_file(msg, filename, 0) < 0)
 733                 die_errno(_("Could not read from '%s'"), filename);
 734 }
 735
 736 static void write_merge_state(struct commit_list *);
 737 static void abort_commit(struct commit_list *remoteheads, const char *err_msg)
 738 {
 739         if (err_msg)
 740                 error("%s", err_msg);
 741         fprintf(stderr,
 742                 _("Not committing merge; use 'git commit' to complete the merge.\n"));
 743         write_merge_state(remoteheads);
 744         exit(1);
 745 }
 746
 747 static const char merge_editor_comment[] =
 748 N_("Please enter a commit message to explain why this merge is necessary,\n"
 749    "especially if it merges an updated upstream into a topic branch.\n"
 750    "\n"
 751    "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 752    "the commit.\n");
 753
 754 static void prepare_to_commit(struct commit_list *remoteheads)
 755 {
 756         struct strbuf msg = STRBUF_INIT;
 757         strbuf_addbuf(&msg, &merge_msg);
 758         strbuf_addch(&msg, '\n');
 759         if (0 < option_edit)
 760                 strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
 761         write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
 762         if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
 763                             git_path_merge_msg(), "merge", NULL))
 764                 abort_commit(remoteheads, NULL);
 765         if (0 < option_edit) {
 766                 if (launch_editor(git_path_merge_msg(), NULL, NULL))
 767                         abort_commit(remoteheads, NULL);
 768         }
 769         read_merge_msg(&msg);
 770         strbuf_stripspace(&msg, 0 < option_edit);
 771         if (!msg.len)
 772                 abort_commit(remoteheads, _("Empty commit message."));
 773         strbuf_release(&merge_msg);
 774         strbuf_addbuf(&merge_msg, &msg);
 775         strbuf_release(&msg);
 776 }
 777
 778 static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
 779 {
 780         unsigned char result_tree[20], result_commit[20];
 781         struct commit_list *parents, **pptr = &parents;
 782         static struct lock_file lock;
 783
 784         hold_locked_index(&lock, 1);
 785         refresh_cache(REFRESH_QUIET);
 786         if (active_cache_changed &&
 787             write_locked_index(&the_index, &lock, COMMIT_LOCK))
 788                 return error(_("Unable to write index."));
 789         rollback_lock_file(&lock);
 790
 791         write_tree_trivial(result_tree);
 792         printf(_("Wonderful.\n"));
 793         pptr = commit_list_append(head, pptr);
 794         pptr = commit_list_append(remoteheads->item, pptr);
 795         prepare_to_commit(remoteheads);
 796         if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents,
 797                         result_commit, NULL, sign_commit))
 798                 die(_("failed to write commit object"));
 799         finish(head, remoteheads, result_commit, "In-index merge");
 800         drop_save();
 801         return 0;
 802 }
 803
 804 static int finish_automerge(struct commit *head,
 805                             int head_subsumed,
 806                             struct commit_list *common,
 807                             struct commit_list *remoteheads,
 808                             unsigned char *result_tree,
 809                             const char *wt_strategy)
 810 {
 811         struct commit_list *parents = NULL;
 812         struct strbuf buf = STRBUF_INIT;
 813         unsigned char result_commit[20];
 814
 815         free_commit_list(common);
 816         parents = remoteheads;
 817         if (!head_subsumed || fast_forward == FF_NO)
 818                 commit_list_insert(head, &parents);
 819         strbuf_addch(&merge_msg, '\n');
 820         prepare_to_commit(remoteheads);
 821         if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents,
 822                         result_commit, NULL, sign_commit))
 823                 die(_("failed to write commit object"));
 824         strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
 825         finish(head, remoteheads, result_commit, buf.buf);
 826         strbuf_release(&buf);
 827         drop_save();
 828         return 0;
 829 }
 830
 831 static int suggest_conflicts(void)
 832 {
 833         const char *filename;
 834         FILE *fp;
 835         struct strbuf msgbuf = STRBUF_INIT;
 836
 837         filename = git_path_merge_msg();
 838         fp = fopen(filename, "a");
 839         if (!fp)
 840                 die_errno(_("Could not open '%s' for writing"), filename);
 841
 842         append_conflicts_hint(&msgbuf);
 843         fputs(msgbuf.buf, fp);
 844         strbuf_release(&msgbuf);
 845         fclose(fp);
 846         rerere(allow_rerere_auto);
 847         printf(_("Automatic merge failed; "
 848                         "fix conflicts and then commit the result.\n"));
 849         return 1;
 850 }
 851
 852 static int evaluate_result(void)
 853 {
 854         int cnt = 0;
 855         struct rev_info rev;
 856
 857         /* Check how many files differ. */
 858         init_revisions(&rev, "");
 859         setup_revisions(0, NULL, &rev, NULL);
 860         rev.diffopt.output_format |=
 861                 DIFF_FORMAT_CALLBACK;
 862         rev.diffopt.format_callback = count_diff_files;
 863         rev.diffopt.format_callback_data = &cnt;
 864         run_diff_files(&rev, 0);
 865
 866         /*
 867          * Check how many unmerged entries are
 868          * there.
 869          */
 870         cnt += count_unmerged_entries();
 871
 872         return cnt;
 873 }
 874
 875 /*
 876  * Pretend as if the user told us to merge with the remote-tracking
 877  * branch we have for the upstream of the current branch
 878  */
 879 static int setup_with_upstream(const char ***argv)
 880 {
 881         struct branch *branch = branch_get(NULL);
 882         int i;
 883         const char **args;
 884
 885         if (!branch)
 886                 die(_("No current branch."));
 887         if (!branch->remote_name)
 888                 die(_("No remote for the current branch."));
 889         if (!branch->merge_nr)
 890                 die(_("No default upstream defined for the current branch."));
 891
 892         args = xcalloc(st_add(branch->merge_nr, 1), sizeof(char *));
 893         for (i = 0; i < branch->merge_nr; i++) {
 894                 if (!branch->merge[i]->dst)
 895                         die(_("No remote-tracking branch for %s from %s"),
 896                             branch->merge[i]->src, branch->remote_name);
 897                 args[i] = branch->merge[i]->dst;
 898         }
 899         args[i] = NULL;
 900         *argv = args;
 901         return i;
 902 }
 903
 904 static void write_merge_state(struct commit_list *remoteheads)
 905 {
 906         struct commit_list *j;
 907         struct strbuf buf = STRBUF_INIT;
 908
 909         for (j = remoteheads; j; j = j->next) {
 910                 struct object_id *oid;
 911                 struct commit *c = j->item;
 912                 if (c->util && merge_remote_util(c)->obj) {
 913                         oid = &merge_remote_util(c)->obj->oid;
 914                 } else {
 915                         oid = &c->object.oid;
 916                 }
 917                 strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
 918         }
 919         write_file_buf(git_path_merge_head(), buf.buf, buf.len);
 920         strbuf_addch(&merge_msg, '\n');
 921         write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len);
 922
 923         strbuf_reset(&buf);
 924         if (fast_forward == FF_NO)
 925                 strbuf_addstr(&buf, "no-ff");
 926         write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
 927 }
 928
 929 static int default_edit_option(void)
 930 {
 931         static const char name[] = "GIT_MERGE_AUTOEDIT";
 932         const char *e = getenv(name);
 933         struct stat st_stdin, st_stdout;
 934
 935         if (have_message)
 936                 /* an explicit -m msg without --[no-]edit */
 937                 return 0;
 938
 939         if (e) {
 940                 int v = git_config_maybe_bool(name, e);
 941                 if (v < 0)
 942                         die(_("Bad value '%s' in environment '%s'"), e, name);
 943                 return v;
 944         }
 945
 946         /* Use editor if stdin and stdout are the same and is a tty */
 947         return (!fstat(0, &st_stdin) &&
 948                 !fstat(1, &st_stdout) &&
 949                 isatty(0) && isatty(1) &&
 950                 st_stdin.st_dev == st_stdout.st_dev &&
 951                 st_stdin.st_ino == st_stdout.st_ino &&
 952                 st_stdin.st_mode == st_stdout.st_mode);
 953 }
 954
 955 static struct commit_list *reduce_parents(struct commit *head_commit,
 956                                           int *head_subsumed,
 957                                           struct commit_list *remoteheads)
 958 {
 959         struct commit_list *parents, **remotes;
 960
 961         /*
 962          * Is the current HEAD reachable from another commit being
 963          * merged?  If so we do not want to record it as a parent of
 964          * the resulting merge, unless --no-ff is given.  We will flip
 965          * this variable to 0 when we find HEAD among the independent
 966          * tips being merged.
 967          */
 968         *head_subsumed = 1;
 969
 970         /* Find what parents to record by checking independent ones. */
 971         parents = reduce_heads(remoteheads);
 972
 973         remoteheads = NULL;
 974         remotes = &remoteheads;
 975         while (parents) {
 976                 struct commit *commit = pop_commit(&parents);
 977                 if (commit == head_commit)
 978                         *head_subsumed = 0;
 979                 else
 980                         remotes = &commit_list_insert(commit, remotes)->next;
 981         }
 982         return remoteheads;
 983 }
 984
 985 static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *merge_msg)
 986 {
 987         struct fmt_merge_msg_opts opts;
 988
 989         memset(&opts, 0, sizeof(opts));
 990         opts.add_title = !have_message;
 991         opts.shortlog_len = shortlog_len;
 992         opts.credit_people = (0 < option_edit);
 993
 994         fmt_merge_msg(merge_names, merge_msg, &opts);
 995         if (merge_msg->len)
 996                 strbuf_setlen(merge_msg, merge_msg->len - 1);
 997 }
 998
 999 static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge_names)
1000 {
1001         const char *filename;
1002         int fd, pos, npos;
1003         struct strbuf fetch_head_file = STRBUF_INIT;
1004
1005         if (!merge_names)
1006                 merge_names = &fetch_head_file;
1007
1008         filename = git_path_fetch_head();
1009         fd = open(filename, O_RDONLY);
1010         if (fd < 0)
1011                 die_errno(_("could not open '%s' for reading"), filename);
1012
1013         if (strbuf_read(merge_names, fd, 0) < 0)
1014                 die_errno(_("could not read '%s'"), filename);
1015         if (close(fd) < 0)
1016                 die_errno(_("could not close '%s'"), filename);
1017
1018         for (pos = 0; pos < merge_names->len; pos = npos) {
1019                 unsigned char sha1[20];
1020                 char *ptr;
1021                 struct commit *commit;
1022
1023                 ptr = strchr(merge_names->buf + pos, '\n');
1024                 if (ptr)
1025                         npos = ptr - merge_names->buf + 1;
1026                 else
1027                         npos = merge_names->len;
1028
1029                 if (npos - pos < 40 + 2 ||
1030                     get_sha1_hex(merge_names->buf + pos, sha1))
1031                         commit = NULL; /* bad */
1032                 else if (memcmp(merge_names->buf + pos + 40, "\t\t", 2))
1033                         continue; /* not-for-merge */
1034                 else {
1035                         char saved = merge_names->buf[pos + 40];
1036                         merge_names->buf[pos + 40] = '\0';
1037                         commit = get_merge_parent(merge_names->buf + pos);
1038                         merge_names->buf[pos + 40] = saved;
1039                 }
1040                 if (!commit) {
1041                         if (ptr)
1042                                 *ptr = '\0';
1043                         die(_("not something we can merge in %s: %s"),
1044                             filename, merge_names->buf + pos);
1045                 }
1046                 remotes = &commit_list_insert(commit, remotes)->next;
1047         }
1048
1049         if (merge_names == &fetch_head_file)
1050                 strbuf_release(&fetch_head_file);
1051 }
1052
1053 static struct commit_list *collect_parents(struct commit *head_commit,
1054                                            int *head_subsumed,
1055                                            int argc, const char **argv,
1056                                            struct strbuf *merge_msg)
1057 {
1058         int i;
1059         struct commit_list *remoteheads = NULL;
1060         struct commit_list **remotes = &remoteheads;
1061         struct strbuf merge_names = STRBUF_INIT, *autogen = NULL;
1062
1063         if (merge_msg && (!have_message || shortlog_len))
1064                 autogen = &merge_names;
1065
1066         if (head_commit)
1067                 remotes = &commit_list_insert(head_commit, remotes)->next;
1068
1069         if (argc == 1 && !strcmp(argv[0], "FETCH_HEAD")) {
1070                 handle_fetch_head(remotes, autogen);
1071                 remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
1072         } else {
1073                 for (i = 0; i < argc; i++) {
1074                         struct commit *commit = get_merge_parent(argv[i]);
1075                         if (!commit)
1076                                 help_unknown_ref(argv[i], "merge",
1077                                                  _("not something we can merge"));
1078                         remotes = &commit_list_insert(commit, remotes)->next;
1079                 }
1080                 remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
1081                 if (autogen) {
1082                         struct commit_list *p;
1083                         for (p = remoteheads; p; p = p->next)
1084                                 merge_name(merge_remote_util(p->item)->name, autogen);
1085                 }
1086         }
1087
1088         if (autogen) {
1089                 prepare_merge_message(autogen, merge_msg);
1090                 strbuf_release(autogen);
1091         }
1092
1093         return remoteheads;
1094 }
1095
1096 int cmd_merge(int argc, const char **argv, const char *prefix)
1097 {
1098         unsigned char result_tree[20];
1099         unsigned char stash[20];
1100         unsigned char head_sha1[20];
1101         struct commit *head_commit;
1102         struct strbuf buf = STRBUF_INIT;
1103         int i, ret = 0, head_subsumed;
1104         int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
1105         struct commit_list *common = NULL;
1106         const char *best_strategy = NULL, *wt_strategy = NULL;
1107         struct commit_list *remoteheads, *p;
1108         void *branch_to_free;
1109
1110         if (argc == 2 && !strcmp(argv[1], "-h"))
1111                 usage_with_options(builtin_merge_usage, builtin_merge_options);
1112
1113         /*
1114          * Check if we are _not_ on a detached HEAD, i.e. if there is a
1115          * current branch.
1116          */
1117         branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, NULL);
1118         if (branch && starts_with(branch, "refs/heads/"))
1119                 branch += 11;
1120         if (!branch || is_null_sha1(head_sha1))
1121                 head_commit = NULL;
1122         else
1123                 head_commit = lookup_commit_or_die(head_sha1, "HEAD");
1124
1125         init_diff_ui_defaults();
1126         git_config(git_merge_config, NULL);
1127
1128         if (branch_mergeoptions)
1129                 parse_branch_merge_options(branch_mergeoptions);
1130         argc = parse_options(argc, argv, prefix, builtin_merge_options,
1131                         builtin_merge_usage, 0);
1132         if (shortlog_len < 0)
1133                 shortlog_len = (merge_log_config > 0) ? merge_log_config : 0;
1134
1135         if (verbosity < 0 && show_progress == -1)
1136                 show_progress = 0;
1137
1138         if (abort_current_merge) {
1139                 int nargc = 2;
1140                 const char *nargv[] = {"reset", "--merge", NULL};
1141
1142                 if (!file_exists(git_path_merge_head()))
1143                         die(_("There is no merge to abort (MERGE_HEAD missing)."));
1144
1145                 /* Invoke 'git reset --merge' */
1146                 ret = cmd_reset(nargc, nargv, prefix);
1147                 goto done;
1148         }
1149
1150         if (read_cache_unmerged())
1151                 die_resolve_conflict("merge");
1152
1153         if (file_exists(git_path_merge_head())) {
1154                 /*
1155                  * There is no unmerged entry, don't advise 'git
1156                  * add/rm <file>', just 'git commit'.
1157                  */
1158                 if (advice_resolve_conflict)
1159                         die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1160                                   "Please, commit your changes before you merge."));
1161                 else
1162                         die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1163         }
1164         if (file_exists(git_path_cherry_pick_head())) {
1165                 if (advice_resolve_conflict)
1166                         die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1167                             "Please, commit your changes before you merge."));
1168                 else
1169                         die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1170         }
1171         resolve_undo_clear();
1172
1173         if (verbosity < 0)
1174                 show_diffstat = 0;
1175
1176         if (squash) {
1177                 if (fast_forward == FF_NO)
1178                         die(_("You cannot combine --squash with --no-ff."));
1179                 option_commit = 0;
1180         }
1181
1182         if (!argc) {
1183                 if (default_to_upstream)
1184                         argc = setup_with_upstream(&argv);
1185                 else
1186                         die(_("No commit specified and merge.defaultToUpstream not set."));
1187         } else if (argc == 1 && !strcmp(argv[0], "-")) {
1188                 argv[0] = "@{-1}";
1189         }
1190
1191         if (!argc)
1192                 usage_with_options(builtin_merge_usage,
1193                         builtin_merge_options);
1194
1195         if (!head_commit) {
1196                 /*
1197                  * If the merged head is a valid one there is no reason
1198                  * to forbid "git merge" into a branch yet to be born.
1199                  * We do the same for "git pull".
1200                  */
1201                 unsigned char *remote_head_sha1;
1202                 if (squash)
1203                         die(_("Squash commit into empty head not supported yet"));
1204                 if (fast_forward == FF_NO)
1205                         die(_("Non-fast-forward commit does not make sense into "
1206                             "an empty head"));
1207                 remoteheads = collect_parents(head_commit, &head_subsumed,
1208                                               argc, argv, NULL);
1209                 if (!remoteheads)
1210                         die(_("%s - not something we can merge"), argv[0]);
1211                 if (remoteheads->next)
1212                         die(_("Can merge only exactly one commit into empty head"));
1213                 remote_head_sha1 = remoteheads->item->object.oid.hash;
1214                 read_empty(remote_head_sha1, 0);
1215                 update_ref("initial pull", "HEAD", remote_head_sha1,
1216                            NULL, 0, UPDATE_REFS_DIE_ON_ERR);
1217                 goto done;
1218         }
1219
1220         /*
1221          * All the rest are the commits being merged; prepare
1222          * the standard merge summary message to be appended
1223          * to the given message.
1224          */
1225         remoteheads = collect_parents(head_commit, &head_subsumed,
1226                                       argc, argv, &merge_msg);
1227
1228         if (!head_commit || !argc)
1229                 usage_with_options(builtin_merge_usage,
1230                         builtin_merge_options);
1231
1232         if (verify_signatures) {
1233                 for (p = remoteheads; p; p = p->next) {
1234                         struct commit *commit = p->item;
1235                         char hex[GIT_SHA1_HEXSZ + 1];
1236                         struct signature_check signature_check;
1237                         memset(&signature_check, 0, sizeof(signature_check));
1238
1239                         check_commit_signature(commit, &signature_check);
1240
1241                         find_unique_abbrev_r(hex, commit->object.oid.hash, DEFAULT_ABBREV);
1242                         switch (signature_check.result) {
1243                         case 'G':
1244                                 break;
1245                         case 'U':
1246                                 die(_("Commit %s has an untrusted GPG signature, "
1247                                       "allegedly by %s."), hex, signature_check.signer);
1248                         case 'B':
1249                                 die(_("Commit %s has a bad GPG signature "
1250                                       "allegedly by %s."), hex, signature_check.signer);
1251                         default: /* 'N' */
1252                                 die(_("Commit %s does not have a GPG signature."), hex);
1253                         }
1254                         if (verbosity >= 0 && signature_check.result == 'G')
1255                                 printf(_("Commit %s has a good GPG signature by %s\n"),
1256                                        hex, signature_check.signer);
1257
1258                         signature_check_clear(&signature_check);
1259                 }
1260         }
1261
1262         strbuf_addstr(&buf, "merge");
1263         for (p = remoteheads; p; p = p->next)
1264                 strbuf_addf(&buf, " %s", merge_remote_util(p->item)->name);
1265         setenv("GIT_REFLOG_ACTION", buf.buf, 0);
1266         strbuf_reset(&buf);
1267
1268         for (p = remoteheads; p; p = p->next) {
1269                 struct commit *commit = p->item;
1270                 strbuf_addf(&buf, "GITHEAD_%s",
1271                             oid_to_hex(&commit->object.oid));
1272                 setenv(buf.buf, merge_remote_util(commit)->name, 1);
1273                 strbuf_reset(&buf);
1274                 if (fast_forward != FF_ONLY &&
1275                     merge_remote_util(commit) &&
1276                     merge_remote_util(commit)->obj &&
1277                     merge_remote_util(commit)->obj->type == OBJ_TAG)
1278                         fast_forward = FF_NO;
1279         }
1280
1281         if (option_edit < 0)
1282                 option_edit = default_edit_option();
1283
1284         if (!use_strategies) {
1285                 if (!remoteheads)
1286                         ; /* already up-to-date */
1287                 else if (!remoteheads->next)
1288                         add_strategies(pull_twohead, DEFAULT_TWOHEAD);
1289                 else
1290                         add_strategies(pull_octopus, DEFAULT_OCTOPUS);
1291         }
1292
1293         for (i = 0; i < use_strategies_nr; i++) {
1294                 if (use_strategies[i]->attr & NO_FAST_FORWARD)
1295                         fast_forward = FF_NO;
1296                 if (use_strategies[i]->attr & NO_TRIVIAL)
1297                         allow_trivial = 0;
1298         }
1299
1300         if (!remoteheads)
1301                 ; /* already up-to-date */
1302         else if (!remoteheads->next)
1303                 common = get_merge_bases(head_commit, remoteheads->item);
1304         else {
1305                 struct commit_list *list = remoteheads;
1306                 commit_list_insert(head_commit, &list);
1307                 common = get_octopus_merge_bases(list);
1308                 free(list);
1309         }
1310
1311         update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.oid.hash,
1312                    NULL, 0, UPDATE_REFS_DIE_ON_ERR);
1313
1314         if (remoteheads && !common) {
1315                 /* No common ancestors found. */
1316                 if (!allow_unrelated_histories)
1317                         die(_("refusing to merge unrelated histories"));
1318                 /* otherwise, we need a real merge. */
1319         } else if (!remoteheads ||
1320                  (!remoteheads->next && !common->next &&
1321                   common->item == remoteheads->item)) {
1322                 /*
1323                  * If head can reach all the merge then we are up to date.
1324                  * but first the most common case of merging one remote.
1325                  */
1326                 finish_up_to_date(_("Already up-to-date."));
1327                 goto done;
1328         } else if (fast_forward != FF_NO && !remoteheads->next &&
1329                         !common->next &&
1330                         !oidcmp(&common->item->object.oid, &head_commit->object.oid)) {
1331                 /* Again the most common case of merging one remote. */
1332                 struct strbuf msg = STRBUF_INIT;
1333                 struct commit *commit;
1334
1335                 if (verbosity >= 0) {
1336                         printf(_("Updating %s..%s\n"),
1337                                find_unique_abbrev(head_commit->object.oid.hash,
1338                                                   DEFAULT_ABBREV),
1339                                find_unique_abbrev(remoteheads->item->object.oid.hash,
1340                                                   DEFAULT_ABBREV));
1341                 }
1342                 strbuf_addstr(&msg, "Fast-forward");
1343                 if (have_message)
1344                         strbuf_addstr(&msg,
1345                                 " (no commit created; -m option ignored)");
1346                 commit = remoteheads->item;
1347                 if (!commit) {
1348                         ret = 1;
1349                         goto done;
1350                 }
1351
1352                 if (checkout_fast_forward(head_commit->object.oid.hash,
1353                                           commit->object.oid.hash,
1354                                           overwrite_ignore)) {
1355                         ret = 1;
1356                         goto done;
1357                 }
1358
1359                 finish(head_commit, remoteheads, commit->object.oid.hash, msg.buf);
1360                 drop_save();
1361                 goto done;
1362         } else if (!remoteheads->next && common->next)
1363                 ;
1364                 /*
1365                  * We are not doing octopus and not fast-forward.  Need
1366                  * a real merge.
1367                  */
1368         else if (!remoteheads->next && !common->next && option_commit) {
1369                 /*
1370                  * We are not doing octopus, not fast-forward, and have
1371                  * only one common.
1372                  */
1373                 refresh_cache(REFRESH_QUIET);
1374                 if (allow_trivial && fast_forward != FF_ONLY) {
1375                         /* See if it is really trivial. */
1376                         git_committer_info(IDENT_STRICT);
1377                         printf(_("Trying really trivial in-index merge...\n"));
1378                         if (!read_tree_trivial(common->item->object.oid.hash,
1379                                                head_commit->object.oid.hash,
1380                                                remoteheads->item->object.oid.hash)) {
1381                                 ret = merge_trivial(head_commit, remoteheads);
1382                                 goto done;
1383                         }
1384                         printf(_("Nope.\n"));
1385                 }
1386         } else {
1387                 /*
1388                  * An octopus.  If we can reach all the remote we are up
1389                  * to date.
1390                  */
1391                 int up_to_date = 1;
1392                 struct commit_list *j;
1393
1394                 for (j = remoteheads; j; j = j->next) {
1395                         struct commit_list *common_one;
1396
1397                         /*
1398                          * Here we *have* to calculate the individual
1399                          * merge_bases again, otherwise "git merge HEAD^
1400                          * HEAD^^" would be missed.
1401                          */
1402                         common_one = get_merge_bases(head_commit, j->item);
1403                         if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) {
1404                                 up_to_date = 0;
1405                                 break;
1406                         }
1407                 }
1408                 if (up_to_date) {
1409                         finish_up_to_date(_("Already up-to-date. Yeeah!"));
1410                         goto done;
1411                 }
1412         }
1413
1414         if (fast_forward == FF_ONLY)
1415                 die(_("Not possible to fast-forward, aborting."));
1416
1417         /* We are going to make a new commit. */
1418         git_committer_info(IDENT_STRICT);
1419
1420         /*
1421          * At this point, we need a real merge.  No matter what strategy
1422          * we use, it would operate on the index, possibly affecting the
1423          * working tree, and when resolved cleanly, have the desired
1424          * tree in the index -- this means that the index must be in
1425          * sync with the head commit.  The strategies are responsible
1426          * to ensure this.
1427          */
1428         if (use_strategies_nr == 1 ||
1429             /*
1430              * Stash away the local changes so that we can try more than one.
1431              */
1432             save_state(stash))
1433                 hashclr(stash);
1434
1435         for (i = 0; i < use_strategies_nr; i++) {
1436                 int ret;
1437                 if (i) {
1438                         printf(_("Rewinding the tree to pristine...\n"));
1439                         restore_state(head_commit->object.oid.hash, stash);
1440                 }
1441                 if (use_strategies_nr != 1)
1442                         printf(_("Trying merge strategy %s...\n"),
1443                                 use_strategies[i]->name);
1444                 /*
1445                  * Remember which strategy left the state in the working
1446                  * tree.
1447                  */
1448                 wt_strategy = use_strategies[i]->name;
1449
1450                 ret = try_merge_strategy(use_strategies[i]->name,
1451                                          common, remoteheads,
1452                                          head_commit);
1453                 if (!option_commit && !ret) {
1454                         merge_was_ok = 1;
1455                         /*
1456                          * This is necessary here just to avoid writing
1457                          * the tree, but later we will *not* exit with
1458                          * status code 1 because merge_was_ok is set.
1459                          */
1460                         ret = 1;
1461                 }
1462
1463                 if (ret) {
1464                         /*
1465                          * The backend exits with 1 when conflicts are
1466                          * left to be resolved, with 2 when it does not
1467                          * handle the given merge at all.
1468                          */
1469                         if (ret == 1) {
1470                                 int cnt = evaluate_result();
1471
1472                                 if (best_cnt <= 0 || cnt <= best_cnt) {
1473                                         best_strategy = use_strategies[i]->name;
1474                                         best_cnt = cnt;
1475                                 }
1476                         }
1477                         if (merge_was_ok)
1478                                 break;
1479                         else
1480                                 continue;
1481                 }
1482
1483                 /* Automerge succeeded. */
1484                 write_tree_trivial(result_tree);
1485                 automerge_was_ok = 1;
1486                 break;
1487         }
1488
1489         /*
1490          * If we have a resulting tree, that means the strategy module
1491          * auto resolved the merge cleanly.
1492          */
1493         if (automerge_was_ok) {
1494                 ret = finish_automerge(head_commit, head_subsumed,
1495                                        common, remoteheads,
1496                                        result_tree, wt_strategy);
1497                 goto done;
1498         }
1499
1500         /*
1501          * Pick the result from the best strategy and have the user fix
1502          * it up.
1503          */
1504         if (!best_strategy) {
1505                 restore_state(head_commit->object.oid.hash, stash);
1506                 if (use_strategies_nr > 1)
1507                         fprintf(stderr,
1508                                 _("No merge strategy handled the merge.\n"));
1509                 else
1510                         fprintf(stderr, _("Merge with strategy %s failed.\n"),
1511                                 use_strategies[0]->name);
1512                 ret = 2;
1513                 goto done;
1514         } else if (best_strategy == wt_strategy)
1515                 ; /* We already have its result in the working tree. */
1516         else {
1517                 printf(_("Rewinding the tree to pristine...\n"));
1518                 restore_state(head_commit->object.oid.hash, stash);
1519                 printf(_("Using the %s to prepare resolving by hand.\n"),
1520                         best_strategy);
1521                 try_merge_strategy(best_strategy, common, remoteheads,
1522                                    head_commit);
1523         }
1524
1525         if (squash)
1526                 finish(head_commit, remoteheads, NULL, NULL);
1527         else
1528                 write_merge_state(remoteheads);
1529
1530         if (merge_was_ok)
1531                 fprintf(stderr, _("Automatic merge went well; "
1532                         "stopped before committing as requested\n"));
1533         else
1534                 ret = suggest_conflicts();
1535
1536 done:
1537         free(branch_to_free);
1538         return ret;
1539 }