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