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