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