4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
10 #include "parse-options.h"
12 #include "run-command.h"
18 #include "unpack-trees.h"
19 #include "cache-tree.h"
26 #include "merge-recursive.h"
28 #define DEFAULT_TWOHEAD (1<<0)
29 #define DEFAULT_OCTOPUS (1<<1)
30 #define NO_FAST_FORWARD (1<<2)
31 #define NO_TRIVIAL (1<<3)
38 static const char * const builtin_merge_usage[] = {
39 "git merge [options] <remote>...",
40 "git merge [options] <msg> HEAD <remote>",
44 static int show_diffstat = 1, option_log, squash;
45 static int option_commit = 1, allow_fast_forward = 1;
46 static int fast_forward_only;
47 static int allow_trivial = 1, have_message;
48 static struct strbuf merge_msg;
49 static struct commit_list *remoteheads;
50 static unsigned char head[20], stash[20];
51 static struct strategy **use_strategies;
52 static size_t use_strategies_nr, use_strategies_alloc;
53 static const char *branch;
56 static struct strategy all_strategy[] = {
57 { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
58 { "octopus", DEFAULT_OCTOPUS },
60 { "ours", NO_FAST_FORWARD | NO_TRIVIAL },
61 { "subtree", NO_FAST_FORWARD | NO_TRIVIAL },
64 static const char *pull_twohead, *pull_octopus;
66 static int option_parse_message(const struct option *opt,
67 const char *arg, int unset)
69 struct strbuf *buf = opt->value;
72 strbuf_setlen(buf, 0);
74 strbuf_addf(buf, "%s\n\n", arg);
77 return error("switch `m' requires a value");
81 static struct strategy *get_strategy(const char *name)
85 static struct cmdnames main_cmds, other_cmds;
91 for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
92 if (!strcmp(name, all_strategy[i].name))
93 return &all_strategy[i];
96 struct cmdnames not_strategies;
99 memset(¬_strategies, 0, sizeof(struct cmdnames));
100 load_command_list("git-merge-", &main_cmds, &other_cmds);
101 for (i = 0; i < main_cmds.cnt; i++) {
103 struct cmdname *ent = main_cmds.names[i];
104 for (j = 0; j < ARRAY_SIZE(all_strategy); j++)
105 if (!strncmp(ent->name, all_strategy[j].name, ent->len)
106 && !all_strategy[j].name[ent->len])
109 add_cmdname(¬_strategies, ent->name, ent->len);
110 exclude_cmds(&main_cmds, ¬_strategies);
113 if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
114 fprintf(stderr, "Could not find merge strategy '%s'.\n", name);
115 fprintf(stderr, "Available strategies are:");
116 for (i = 0; i < main_cmds.cnt; i++)
117 fprintf(stderr, " %s", main_cmds.names[i]->name);
118 fprintf(stderr, ".\n");
119 if (other_cmds.cnt) {
120 fprintf(stderr, "Available custom strategies are:");
121 for (i = 0; i < other_cmds.cnt; i++)
122 fprintf(stderr, " %s", other_cmds.names[i]->name);
123 fprintf(stderr, ".\n");
128 ret = xcalloc(1, sizeof(struct strategy));
129 ret->name = xstrdup(name);
133 static void append_strategy(struct strategy *s)
135 ALLOC_GROW(use_strategies, use_strategies_nr + 1, use_strategies_alloc);
136 use_strategies[use_strategies_nr++] = s;
139 static int option_parse_strategy(const struct option *opt,
140 const char *name, int unset)
145 append_strategy(get_strategy(name));
149 static int option_parse_n(const struct option *opt,
150 const char *arg, int unset)
152 show_diffstat = unset;
156 static struct option builtin_merge_options[] = {
157 { OPTION_CALLBACK, 'n', NULL, NULL, NULL,
158 "do not show a diffstat at the end of the merge",
159 PARSE_OPT_NOARG, option_parse_n },
160 OPT_BOOLEAN(0, "stat", &show_diffstat,
161 "show a diffstat at the end of the merge"),
162 OPT_BOOLEAN(0, "summary", &show_diffstat, "(synonym to --stat)"),
163 OPT_BOOLEAN(0, "log", &option_log,
164 "add list of one-line log to merge commit message"),
165 OPT_BOOLEAN(0, "squash", &squash,
166 "create a single commit instead of doing a merge"),
167 OPT_BOOLEAN(0, "commit", &option_commit,
168 "perform a commit if the merge succeeds (default)"),
169 OPT_BOOLEAN(0, "ff", &allow_fast_forward,
170 "allow fast forward (default)"),
171 OPT_BOOLEAN(0, "ff-only", &fast_forward_only,
172 "abort if fast forward is not possible"),
173 OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
174 "merge strategy to use", option_parse_strategy),
175 OPT_CALLBACK('m', "message", &merge_msg, "message",
176 "message to be used for the merge commit (if any)",
177 option_parse_message),
178 OPT__VERBOSITY(&verbosity),
182 /* Cleans up metadata that is uninteresting after a succeeded merge. */
183 static void drop_save(void)
185 unlink(git_path("MERGE_HEAD"));
186 unlink(git_path("MERGE_MSG"));
187 unlink(git_path("MERGE_MODE"));
190 static void save_state(void)
193 struct child_process cp;
194 struct strbuf buffer = STRBUF_INIT;
195 const char *argv[] = {"stash", "create", NULL};
197 memset(&cp, 0, sizeof(cp));
202 if (start_command(&cp))
203 die("could not run stash.");
204 len = strbuf_read(&buffer, cp.out, 1024);
207 if (finish_command(&cp) || len < 0)
211 strbuf_setlen(&buffer, buffer.len-1);
212 if (get_sha1(buffer.buf, stash))
213 die("not a valid object: %s", buffer.buf);
216 static void reset_hard(unsigned const char *sha1, int verbose)
221 args[i++] = "read-tree";
224 args[i++] = "--reset";
226 args[i++] = sha1_to_hex(sha1);
229 if (run_command_v_opt(args, RUN_GIT_CMD))
230 die("read-tree failed");
233 static void restore_state(void)
235 struct strbuf sb = STRBUF_INIT;
236 const char *args[] = { "stash", "apply", NULL, NULL };
238 if (is_null_sha1(stash))
243 args[2] = sha1_to_hex(stash);
246 * It is OK to ignore error here, for example when there was
247 * nothing to restore.
249 run_command_v_opt(args, RUN_GIT_CMD);
252 refresh_cache(REFRESH_QUIET);
255 /* This is called when no merge was necessary. */
256 static void finish_up_to_date(const char *msg)
259 printf("%s%s\n", squash ? " (nothing to squash)" : "", msg);
263 static void squash_message(void)
266 struct commit *commit;
267 struct strbuf out = STRBUF_INIT;
268 struct commit_list *j;
271 printf("Squash commit -- not updating HEAD\n");
272 fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666);
274 die_errno("Could not write to '%s'", git_path("SQUASH_MSG"));
276 init_revisions(&rev, NULL);
277 rev.ignore_merges = 1;
278 rev.commit_format = CMIT_FMT_MEDIUM;
280 commit = lookup_commit(head);
281 commit->object.flags |= UNINTERESTING;
282 add_pending_object(&rev, &commit->object, NULL);
284 for (j = remoteheads; j; j = j->next)
285 add_pending_object(&rev, &j->item->object, NULL);
287 setup_revisions(0, NULL, &rev, NULL);
288 if (prepare_revision_walk(&rev))
289 die("revision walk setup failed");
291 strbuf_addstr(&out, "Squashed commit of the following:\n");
292 while ((commit = get_revision(&rev)) != NULL) {
293 strbuf_addch(&out, '\n');
294 strbuf_addf(&out, "commit %s\n",
295 sha1_to_hex(commit->object.sha1));
296 pretty_print_commit(rev.commit_format, commit, &out, rev.abbrev,
297 NULL, NULL, rev.date_mode, 0);
299 if (write(fd, out.buf, out.len) < 0)
300 die_errno("Writing SQUASH_MSG");
302 die_errno("Finishing SQUASH_MSG");
303 strbuf_release(&out);
306 static void finish(const unsigned char *new_head, const char *msg)
308 struct strbuf reflog_message = STRBUF_INIT;
311 strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION"));
315 strbuf_addf(&reflog_message, "%s: %s",
316 getenv("GIT_REFLOG_ACTION"), msg);
321 if (verbosity >= 0 && !merge_msg.len)
322 printf("No merge message -- not updating HEAD\n");
324 const char *argv_gc_auto[] = { "gc", "--auto", NULL };
325 update_ref(reflog_message.buf, "HEAD",
329 * We ignore errors in 'gc --auto', since the
330 * user should see them.
332 run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
335 if (new_head && show_diffstat) {
336 struct diff_options opts;
338 opts.output_format |=
339 DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
340 opts.detect_rename = DIFF_DETECT_RENAME;
341 if (diff_use_color_default > 0)
342 DIFF_OPT_SET(&opts, COLOR_DIFF);
343 if (diff_setup_done(&opts) < 0)
344 die("diff_setup_done failed");
345 diff_tree_sha1(head, new_head, "", &opts);
350 /* Run a post-merge hook */
351 run_hook(NULL, "post-merge", squash ? "1" : "0", NULL);
353 strbuf_release(&reflog_message);
356 /* Get the name for the merge commit's message. */
357 static void merge_name(const char *remote, struct strbuf *msg)
359 struct object *remote_head;
360 unsigned char branch_head[20], buf_sha[20];
361 struct strbuf buf = STRBUF_INIT;
362 struct strbuf bname = STRBUF_INIT;
367 strbuf_branchname(&bname, remote);
370 memset(branch_head, 0, sizeof(branch_head));
371 remote_head = peel_to_type(remote, 0, NULL, OBJ_COMMIT);
373 die("'%s' does not point to a commit", remote);
375 if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) {
376 if (!prefixcmp(found_ref, "refs/heads/")) {
377 strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
378 sha1_to_hex(branch_head), remote);
381 if (!prefixcmp(found_ref, "refs/remotes/")) {
382 strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n",
383 sha1_to_hex(branch_head), remote);
388 /* See if remote matches <name>^^^.. or <name>~<number> */
389 for (len = 0, ptr = remote + strlen(remote);
390 remote < ptr && ptr[-1] == '^';
397 ptr = strrchr(remote, '~');
399 int seen_nonzero = 0;
402 while (*++ptr && isdigit(*ptr)) {
403 seen_nonzero |= (*ptr != '0');
407 len = 0; /* not ...~<number> */
408 else if (seen_nonzero)
411 early = 1; /* "name~" is "name~1"! */
415 struct strbuf truname = STRBUF_INIT;
416 strbuf_addstr(&truname, "refs/heads/");
417 strbuf_addstr(&truname, remote);
418 strbuf_setlen(&truname, truname.len - len);
419 if (resolve_ref(truname.buf, buf_sha, 0, NULL)) {
421 "%s\t\tbranch '%s'%s of .\n",
422 sha1_to_hex(remote_head->sha1),
424 (early ? " (early part)" : ""));
425 strbuf_release(&truname);
430 if (!strcmp(remote, "FETCH_HEAD") &&
431 !access(git_path("FETCH_HEAD"), R_OK)) {
433 struct strbuf line = STRBUF_INIT;
436 fp = fopen(git_path("FETCH_HEAD"), "r");
438 die_errno("could not open '%s' for reading",
439 git_path("FETCH_HEAD"));
440 strbuf_getline(&line, fp, '\n');
442 ptr = strstr(line.buf, "\tnot-for-merge\t");
444 strbuf_remove(&line, ptr-line.buf+1, 13);
445 strbuf_addbuf(msg, &line);
446 strbuf_release(&line);
449 strbuf_addf(msg, "%s\t\tcommit '%s'\n",
450 sha1_to_hex(remote_head->sha1), remote);
452 strbuf_release(&buf);
453 strbuf_release(&bname);
456 static int git_merge_config(const char *k, const char *v, void *cb)
458 if (branch && !prefixcmp(k, "branch.") &&
459 !prefixcmp(k + 7, branch) &&
460 !strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
466 argc = split_cmdline(buf, &argv);
468 die("Bad branch.%s.mergeoptions string", branch);
469 argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
470 memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
472 parse_options(argc, argv, NULL, builtin_merge_options,
473 builtin_merge_usage, 0);
477 if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
478 show_diffstat = git_config_bool(k, v);
479 else if (!strcmp(k, "pull.twohead"))
480 return git_config_string(&pull_twohead, k, v);
481 else if (!strcmp(k, "pull.octopus"))
482 return git_config_string(&pull_octopus, k, v);
483 else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary"))
484 option_log = git_config_bool(k, v);
485 return git_diff_ui_config(k, v, cb);
488 static int read_tree_trivial(unsigned char *common, unsigned char *head,
492 struct tree *trees[MAX_UNPACK_TREES];
493 struct tree_desc t[MAX_UNPACK_TREES];
494 struct unpack_trees_options opts;
496 memset(&opts, 0, sizeof(opts));
498 opts.src_index = &the_index;
499 opts.dst_index = &the_index;
501 opts.verbose_update = 1;
502 opts.trivial_merges_only = 1;
504 trees[nr_trees] = parse_tree_indirect(common);
505 if (!trees[nr_trees++])
507 trees[nr_trees] = parse_tree_indirect(head);
508 if (!trees[nr_trees++])
510 trees[nr_trees] = parse_tree_indirect(one);
511 if (!trees[nr_trees++])
513 opts.fn = threeway_merge;
514 cache_tree_free(&active_cache_tree);
515 for (i = 0; i < nr_trees; i++) {
516 parse_tree(trees[i]);
517 init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
519 if (unpack_trees(nr_trees, t, &opts))
524 static void write_tree_trivial(unsigned char *sha1)
526 if (write_cache_as_tree(sha1, 0, NULL))
527 die("git write-tree failed to write a tree");
530 static int try_merge_strategy(const char *strategy, struct commit_list *common,
531 const char *head_arg)
535 struct commit_list *j;
536 struct strbuf buf = STRBUF_INIT;
538 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
540 index_fd = hold_locked_index(lock, 1);
541 refresh_cache(REFRESH_QUIET);
542 if (active_cache_changed &&
543 (write_cache(index_fd, active_cache, active_nr) ||
544 commit_locked_index(lock)))
545 return error("Unable to write index.");
546 rollback_lock_file(lock);
548 if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
550 struct commit *result;
551 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
553 struct commit_list *reversed = NULL;
554 struct merge_options o;
556 if (remoteheads->next) {
557 error("Not handling anything other than two heads merge.");
561 init_merge_options(&o);
562 if (!strcmp(strategy, "subtree"))
565 o.branch1 = head_arg;
566 o.branch2 = remoteheads->item->util;
568 for (j = common; j; j = j->next)
569 commit_list_insert(j->item, &reversed);
571 index_fd = hold_locked_index(lock, 1);
572 clean = merge_recursive(&o, lookup_commit(head),
573 remoteheads->item, reversed, &result);
574 if (active_cache_changed &&
575 (write_cache(index_fd, active_cache, active_nr) ||
576 commit_locked_index(lock)))
577 die ("unable to write %s", get_index_file());
578 rollback_lock_file(lock);
579 return clean ? 0 : 1;
581 args = xmalloc((4 + commit_list_count(common) +
582 commit_list_count(remoteheads)) * sizeof(char *));
583 strbuf_addf(&buf, "merge-%s", strategy);
585 for (j = common; j; j = j->next)
586 args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1));
588 args[i++] = head_arg;
589 for (j = remoteheads; j; j = j->next)
590 args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1));
592 ret = run_command_v_opt(args, RUN_GIT_CMD);
593 strbuf_release(&buf);
595 for (j = common; j; j = j->next)
596 free((void *)args[i++]);
598 for (j = remoteheads; j; j = j->next)
599 free((void *)args[i++]);
602 if (read_cache() < 0)
603 die("failed to read the cache");
608 static void count_diff_files(struct diff_queue_struct *q,
609 struct diff_options *opt, void *data)
616 static int count_unmerged_entries(void)
618 const struct index_state *state = &the_index;
621 for (i = 0; i < state->cache_nr; i++)
622 if (ce_stage(state->cache[i]))
628 static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
630 struct tree *trees[MAX_UNPACK_TREES];
631 struct unpack_trees_options opts;
632 struct tree_desc t[MAX_UNPACK_TREES];
633 int i, fd, nr_trees = 0;
634 struct dir_struct dir;
635 struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
637 refresh_cache(REFRESH_QUIET);
639 fd = hold_locked_index(lock_file, 1);
641 memset(&trees, 0, sizeof(trees));
642 memset(&opts, 0, sizeof(opts));
643 memset(&t, 0, sizeof(t));
644 memset(&dir, 0, sizeof(dir));
645 dir.flags |= DIR_SHOW_IGNORED;
646 dir.exclude_per_dir = ".gitignore";
650 opts.src_index = &the_index;
651 opts.dst_index = &the_index;
653 opts.verbose_update = 1;
655 opts.fn = twoway_merge;
657 trees[nr_trees] = parse_tree_indirect(head);
658 if (!trees[nr_trees++])
660 trees[nr_trees] = parse_tree_indirect(remote);
661 if (!trees[nr_trees++])
663 for (i = 0; i < nr_trees; i++) {
664 parse_tree(trees[i]);
665 init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
667 if (unpack_trees(nr_trees, t, &opts))
669 if (write_cache(fd, active_cache, active_nr) ||
670 commit_locked_index(lock_file))
671 die("unable to write new index file");
675 static void split_merge_strategies(const char *string, struct strategy **list,
683 buf = xstrdup(string);
688 ALLOC_GROW(*list, *nr + 1, *alloc);
689 (*list)[(*nr)++].name = xstrdup(q);
694 ALLOC_GROW(*list, *nr + 1, *alloc);
695 (*list)[(*nr)++].name = xstrdup(q);
701 static void add_strategies(const char *string, unsigned attr)
703 struct strategy *list = NULL;
704 int list_alloc = 0, list_nr = 0, i;
706 memset(&list, 0, sizeof(list));
707 split_merge_strategies(string, &list, &list_nr, &list_alloc);
709 for (i = 0; i < list_nr; i++)
710 append_strategy(get_strategy(list[i].name));
713 for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
714 if (all_strategy[i].attr & attr)
715 append_strategy(&all_strategy[i]);
719 static int merge_trivial(void)
721 unsigned char result_tree[20], result_commit[20];
722 struct commit_list *parent = xmalloc(sizeof(*parent));
724 write_tree_trivial(result_tree);
725 printf("Wonderful.\n");
726 parent->item = lookup_commit(head);
727 parent->next = xmalloc(sizeof(*parent->next));
728 parent->next->item = remoteheads->item;
729 parent->next->next = NULL;
730 commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
731 finish(result_commit, "In-index merge");
736 static int finish_automerge(struct commit_list *common,
737 unsigned char *result_tree,
738 const char *wt_strategy)
740 struct commit_list *parents = NULL, *j;
741 struct strbuf buf = STRBUF_INIT;
742 unsigned char result_commit[20];
744 free_commit_list(common);
745 if (allow_fast_forward) {
746 parents = remoteheads;
747 commit_list_insert(lookup_commit(head), &parents);
748 parents = reduce_heads(parents);
750 struct commit_list **pptr = &parents;
752 pptr = &commit_list_insert(lookup_commit(head),
754 for (j = remoteheads; j; j = j->next)
755 pptr = &commit_list_insert(j->item, pptr)->next;
757 free_commit_list(remoteheads);
758 strbuf_addch(&merge_msg, '\n');
759 commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
760 strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
761 finish(result_commit, buf.buf);
762 strbuf_release(&buf);
767 static int suggest_conflicts(void)
772 fp = fopen(git_path("MERGE_MSG"), "a");
774 die_errno("Could not open '%s' for writing",
775 git_path("MERGE_MSG"));
776 fprintf(fp, "\nConflicts:\n");
777 for (pos = 0; pos < active_nr; pos++) {
778 struct cache_entry *ce = active_cache[pos];
781 fprintf(fp, "\t%s\n", ce->name);
782 while (pos + 1 < active_nr &&
784 active_cache[pos + 1]->name))
790 printf("Automatic merge failed; "
791 "fix conflicts and then commit the result.\n");
795 static struct commit *is_old_style_invocation(int argc, const char **argv)
797 struct commit *second_token = NULL;
799 unsigned char second_sha1[20];
801 if (get_sha1(argv[1], second_sha1))
803 second_token = lookup_commit_reference_gently(second_sha1, 0);
805 die("'%s' is not a commit", argv[1]);
806 if (hashcmp(second_token->object.sha1, head))
812 static int evaluate_result(void)
817 /* Check how many files differ. */
818 init_revisions(&rev, "");
819 setup_revisions(0, NULL, &rev, NULL);
820 rev.diffopt.output_format |=
821 DIFF_FORMAT_CALLBACK;
822 rev.diffopt.format_callback = count_diff_files;
823 rev.diffopt.format_callback_data = &cnt;
824 run_diff_files(&rev, 0);
827 * Check how many unmerged entries are
830 cnt += count_unmerged_entries();
835 int cmd_merge(int argc, const char **argv, const char *prefix)
837 unsigned char result_tree[20];
838 struct strbuf buf = STRBUF_INIT;
839 const char *head_arg;
840 int flag, head_invalid = 0, i;
841 int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
842 struct commit_list *common = NULL;
843 const char *best_strategy = NULL, *wt_strategy = NULL;
844 struct commit_list **remotes = &remoteheads;
847 if (file_exists(git_path("MERGE_HEAD")))
848 die("You have not concluded your merge. (MERGE_HEAD exists)");
849 if (read_cache_unmerged())
850 die("You are in the middle of a conflicted merge."
851 " (index unmerged)");
854 * Check if we are _not_ on a detached HEAD, i.e. if there is a
857 branch = resolve_ref("HEAD", head, 0, &flag);
858 if (branch && !prefixcmp(branch, "refs/heads/"))
860 if (is_null_sha1(head))
863 git_config(git_merge_config, NULL);
866 if (diff_use_color_default == -1)
867 diff_use_color_default = git_use_color_default;
869 argc = parse_options(argc, argv, prefix, builtin_merge_options,
870 builtin_merge_usage, 0);
875 if (!allow_fast_forward)
876 die("You cannot combine --squash with --no-ff.");
880 if (!allow_fast_forward && fast_forward_only)
881 die("You cannot combine --no-ff with --ff-only.");
884 usage_with_options(builtin_merge_usage,
885 builtin_merge_options);
888 * This could be traditional "merge <msg> HEAD <commit>..." and
889 * the way we can tell it is to see if the second token is HEAD,
890 * but some people might have misused the interface and used a
891 * committish that is the same as HEAD there instead.
892 * Traditional format never would have "-m" so it is an
893 * additional safety measure to check for it.
896 if (!have_message && is_old_style_invocation(argc, argv)) {
897 strbuf_addstr(&merge_msg, argv[0]);
901 } else if (head_invalid) {
902 struct object *remote_head;
904 * If the merged head is a valid one there is no reason
905 * to forbid "git merge" into a branch yet to be born.
906 * We do the same for "git pull".
909 die("Can merge only exactly one commit into "
912 die("Squash commit into empty head not supported yet");
913 if (!allow_fast_forward)
914 die("Non-fast-forward commit does not make sense into "
916 remote_head = peel_to_type(argv[0], 0, NULL, OBJ_COMMIT);
918 die("%s - not something we can merge", argv[0]);
919 update_ref("initial pull", "HEAD", remote_head->sha1, NULL, 0,
921 reset_hard(remote_head->sha1, 0);
924 struct strbuf msg = STRBUF_INIT;
926 /* We are invoked directly as the first-class UI. */
930 * All the rest are the commits being merged;
931 * prepare the standard merge summary message to
932 * be appended to the given message. If remote
933 * is invalid we will die later in the common
934 * codepath so we discard the error in this
937 for (i = 0; i < argc; i++)
938 merge_name(argv[i], &msg);
939 fmt_merge_msg(option_log, &msg, &merge_msg);
941 strbuf_setlen(&merge_msg, merge_msg.len-1);
944 if (head_invalid || !argc)
945 usage_with_options(builtin_merge_usage,
946 builtin_merge_options);
948 strbuf_addstr(&buf, "merge");
949 for (i = 0; i < argc; i++)
950 strbuf_addf(&buf, " %s", argv[i]);
951 setenv("GIT_REFLOG_ACTION", buf.buf, 0);
954 for (i = 0; i < argc; i++) {
956 struct commit *commit;
958 o = peel_to_type(argv[i], 0, NULL, OBJ_COMMIT);
960 die("%s - not something we can merge", argv[i]);
961 commit = lookup_commit(o->sha1);
962 commit->util = (void *)argv[i];
963 remotes = &commit_list_insert(commit, remotes)->next;
965 strbuf_addf(&buf, "GITHEAD_%s", sha1_to_hex(o->sha1));
966 setenv(buf.buf, argv[i], 1);
970 if (!use_strategies) {
971 if (!remoteheads->next)
972 add_strategies(pull_twohead, DEFAULT_TWOHEAD);
974 add_strategies(pull_octopus, DEFAULT_OCTOPUS);
977 for (i = 0; i < use_strategies_nr; i++) {
978 if (use_strategies[i]->attr & NO_FAST_FORWARD)
979 allow_fast_forward = 0;
980 if (use_strategies[i]->attr & NO_TRIVIAL)
984 if (!remoteheads->next)
985 common = get_merge_bases(lookup_commit(head),
986 remoteheads->item, 1);
988 struct commit_list *list = remoteheads;
989 commit_list_insert(lookup_commit(head), &list);
990 common = get_octopus_merge_bases(list);
994 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head, NULL, 0,
998 ; /* No common ancestors found. We need a real merge. */
999 else if (!remoteheads->next && !common->next &&
1000 common->item == remoteheads->item) {
1002 * If head can reach all the merge then we are up to date.
1003 * but first the most common case of merging one remote.
1005 finish_up_to_date("Already up-to-date.");
1007 } else if (allow_fast_forward && !remoteheads->next &&
1009 !hashcmp(common->item->object.sha1, head)) {
1010 /* Again the most common case of merging one remote. */
1011 struct strbuf msg = STRBUF_INIT;
1015 strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV));
1018 printf("Updating %s..%s\n",
1020 find_unique_abbrev(remoteheads->item->object.sha1,
1022 strbuf_addstr(&msg, "Fast forward");
1025 " (no commit created; -m option ignored)");
1026 o = peel_to_type(sha1_to_hex(remoteheads->item->object.sha1),
1027 0, NULL, OBJ_COMMIT);
1031 if (checkout_fast_forward(head, remoteheads->item->object.sha1))
1034 finish(o->sha1, msg.buf);
1037 } else if (!remoteheads->next && common->next)
1040 * We are not doing octopus and not fast forward. Need
1043 else if (!remoteheads->next && !common->next && option_commit) {
1045 * We are not doing octopus, not fast forward, and have
1048 refresh_cache(REFRESH_QUIET);
1049 if (allow_trivial && !fast_forward_only) {
1050 /* See if it is really trivial. */
1051 git_committer_info(IDENT_ERROR_ON_NO_NAME);
1052 printf("Trying really trivial in-index merge...\n");
1053 if (!read_tree_trivial(common->item->object.sha1,
1054 head, remoteheads->item->object.sha1))
1055 return merge_trivial();
1060 * An octopus. If we can reach all the remote we are up
1064 struct commit_list *j;
1066 for (j = remoteheads; j; j = j->next) {
1067 struct commit_list *common_one;
1070 * Here we *have* to calculate the individual
1071 * merge_bases again, otherwise "git merge HEAD^
1072 * HEAD^^" would be missed.
1074 common_one = get_merge_bases(lookup_commit(head),
1076 if (hashcmp(common_one->item->object.sha1,
1077 j->item->object.sha1)) {
1083 finish_up_to_date("Already up-to-date. Yeeah!");
1088 if (fast_forward_only)
1089 die("Not possible to fast forward, aborting.");
1091 /* We are going to make a new commit. */
1092 git_committer_info(IDENT_ERROR_ON_NO_NAME);
1095 * At this point, we need a real merge. No matter what strategy
1096 * we use, it would operate on the index, possibly affecting the
1097 * working tree, and when resolved cleanly, have the desired
1098 * tree in the index -- this means that the index must be in
1099 * sync with the head commit. The strategies are responsible
1102 if (use_strategies_nr != 1) {
1104 * Stash away the local changes so that we can try more
1109 memcpy(stash, null_sha1, 20);
1112 for (i = 0; i < use_strategies_nr; i++) {
1115 printf("Rewinding the tree to pristine...\n");
1118 if (use_strategies_nr != 1)
1119 printf("Trying merge strategy %s...\n",
1120 use_strategies[i]->name);
1122 * Remember which strategy left the state in the working
1125 wt_strategy = use_strategies[i]->name;
1127 ret = try_merge_strategy(use_strategies[i]->name,
1129 if (!option_commit && !ret) {
1132 * This is necessary here just to avoid writing
1133 * the tree, but later we will *not* exit with
1134 * status code 1 because merge_was_ok is set.
1141 * The backend exits with 1 when conflicts are
1142 * left to be resolved, with 2 when it does not
1143 * handle the given merge at all.
1146 int cnt = evaluate_result();
1148 if (best_cnt <= 0 || cnt <= best_cnt) {
1149 best_strategy = use_strategies[i]->name;
1159 /* Automerge succeeded. */
1160 write_tree_trivial(result_tree);
1161 automerge_was_ok = 1;
1166 * If we have a resulting tree, that means the strategy module
1167 * auto resolved the merge cleanly.
1169 if (automerge_was_ok)
1170 return finish_automerge(common, result_tree, wt_strategy);
1173 * Pick the result from the best strategy and have the user fix
1176 if (!best_strategy) {
1178 if (use_strategies_nr > 1)
1180 "No merge strategy handled the merge.\n");
1182 fprintf(stderr, "Merge with strategy %s failed.\n",
1183 use_strategies[0]->name);
1185 } else if (best_strategy == wt_strategy)
1186 ; /* We already have its result in the working tree. */
1188 printf("Rewinding the tree to pristine...\n");
1190 printf("Using the %s to prepare resolving by hand.\n",
1192 try_merge_strategy(best_strategy, common, head_arg);
1199 struct commit_list *j;
1201 for (j = remoteheads; j; j = j->next)
1202 strbuf_addf(&buf, "%s\n",
1203 sha1_to_hex(j->item->object.sha1));
1204 fd = open(git_path("MERGE_HEAD"), O_WRONLY | O_CREAT, 0666);
1206 die_errno("Could not open '%s' for writing",
1207 git_path("MERGE_HEAD"));
1208 if (write_in_full(fd, buf.buf, buf.len) != buf.len)
1209 die_errno("Could not write to '%s'", git_path("MERGE_HEAD"));
1211 strbuf_addch(&merge_msg, '\n');
1212 fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666);
1214 die_errno("Could not open '%s' for writing",
1215 git_path("MERGE_MSG"));
1216 if (write_in_full(fd, merge_msg.buf, merge_msg.len) !=
1218 die_errno("Could not write to '%s'", git_path("MERGE_MSG"));
1220 fd = open(git_path("MERGE_MODE"), O_WRONLY | O_CREAT | O_TRUNC, 0666);
1222 die_errno("Could not open '%s' for writing",
1223 git_path("MERGE_MODE"));
1225 if (!allow_fast_forward)
1226 strbuf_addf(&buf, "no-ff");
1227 if (write_in_full(fd, buf.buf, buf.len) != buf.len)
1228 die_errno("Could not write to '%s'", git_path("MERGE_MODE"));
1233 fprintf(stderr, "Automatic merge went well; "
1234 "stopped before committing as requested\n");
1237 return suggest_conflicts();