4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
11 #include "parse-options.h"
14 #include "run-command.h"
20 #include "unpack-trees.h"
21 #include "cache-tree.h"
28 #include "merge-recursive.h"
29 #include "resolve-undo.h"
31 #include "fmt-merge-msg.h"
32 #include "gpg-interface.h"
33 #include "sequencer.h"
34 #include "string-list.h"
37 #define DEFAULT_TWOHEAD (1<<0)
38 #define DEFAULT_OCTOPUS (1<<1)
39 #define NO_FAST_FORWARD (1<<2)
40 #define NO_TRIVIAL (1<<3)
47 static const char * const builtin_merge_usage
[] = {
48 N_("git merge [<options>] [<commit>...]"),
49 N_("git merge --abort"),
50 N_("git merge --continue"),
54 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
55 static int option_commit
= 1;
56 static int option_edit
= -1;
57 static int allow_trivial
= 1, have_message
, verify_signatures
;
58 static int overwrite_ignore
= 1;
59 static struct strbuf merge_msg
= STRBUF_INIT
;
60 static struct strategy
**use_strategies
;
61 static size_t use_strategies_nr
, use_strategies_alloc
;
62 static const char **xopts
;
63 static size_t xopts_nr
, xopts_alloc
;
64 static const char *branch
;
65 static char *branch_mergeoptions
;
66 static int option_renormalize
;
68 static int allow_rerere_auto
;
69 static int abort_current_merge
;
70 static int continue_current_merge
;
71 static int allow_unrelated_histories
;
72 static int show_progress
= -1;
73 static int default_to_upstream
= 1;
75 static const char *sign_commit
;
77 static struct strategy all_strategy
[] = {
78 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
79 { "octopus", DEFAULT_OCTOPUS
},
81 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
82 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
85 static const char *pull_twohead
, *pull_octopus
;
93 static enum ff_type fast_forward
= FF_ALLOW
;
95 static int option_parse_message(const struct option
*opt
,
96 const char *arg
, int unset
)
98 struct strbuf
*buf
= opt
->value
;
101 strbuf_setlen(buf
, 0);
103 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
106 return error(_("switch `m' requires a value"));
110 static struct strategy
*get_strategy(const char *name
)
113 struct strategy
*ret
;
114 static struct cmdnames main_cmds
, other_cmds
;
120 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
121 if (!strcmp(name
, all_strategy
[i
].name
))
122 return &all_strategy
[i
];
125 struct cmdnames not_strategies
;
128 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
129 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
130 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
132 struct cmdname
*ent
= main_cmds
.names
[i
];
133 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
134 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
135 && !all_strategy
[j
].name
[ent
->len
])
138 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
140 exclude_cmds(&main_cmds
, ¬_strategies
);
142 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
143 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
144 fprintf(stderr
, _("Available strategies are:"));
145 for (i
= 0; i
< main_cmds
.cnt
; i
++)
146 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
147 fprintf(stderr
, ".\n");
148 if (other_cmds
.cnt
) {
149 fprintf(stderr
, _("Available custom strategies are:"));
150 for (i
= 0; i
< other_cmds
.cnt
; i
++)
151 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
152 fprintf(stderr
, ".\n");
157 ret
= xcalloc(1, sizeof(struct strategy
));
158 ret
->name
= xstrdup(name
);
159 ret
->attr
= NO_TRIVIAL
;
163 static void append_strategy(struct strategy
*s
)
165 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
166 use_strategies
[use_strategies_nr
++] = s
;
169 static int option_parse_strategy(const struct option
*opt
,
170 const char *name
, int unset
)
175 append_strategy(get_strategy(name
));
179 static int option_parse_x(const struct option
*opt
,
180 const char *arg
, int unset
)
185 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
186 xopts
[xopts_nr
++] = xstrdup(arg
);
190 static int option_parse_n(const struct option
*opt
,
191 const char *arg
, int unset
)
193 show_diffstat
= unset
;
197 static struct option builtin_merge_options
[] = {
198 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
199 N_("do not show a diffstat at the end of the merge"),
200 PARSE_OPT_NOARG
, option_parse_n
},
201 OPT_BOOL(0, "stat", &show_diffstat
,
202 N_("show a diffstat at the end of the merge")),
203 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
204 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
205 N_("add (at most <n>) entries from shortlog to merge commit message"),
206 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
207 OPT_BOOL(0, "squash", &squash
,
208 N_("create a single commit instead of doing a merge")),
209 OPT_BOOL(0, "commit", &option_commit
,
210 N_("perform a commit if the merge succeeds (default)")),
211 OPT_BOOL('e', "edit", &option_edit
,
212 N_("edit message before committing")),
213 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
214 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
215 N_("abort if fast-forward is not possible"),
216 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
217 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
218 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
219 N_("verify that the named commit has a valid GPG signature")),
220 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
221 N_("merge strategy to use"), option_parse_strategy
),
222 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
223 N_("option for selected merge strategy"), option_parse_x
),
224 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
225 N_("merge commit message (for a non-fast-forward merge)"),
226 option_parse_message
),
227 OPT__VERBOSITY(&verbosity
),
228 OPT_BOOL(0, "abort", &abort_current_merge
,
229 N_("abort the current in-progress merge")),
230 OPT_BOOL(0, "continue", &continue_current_merge
,
231 N_("continue the current in-progress merge")),
232 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories
,
233 N_("allow merging unrelated histories")),
234 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
235 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
236 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
237 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
238 OPT_BOOL(0, "signoff", &signoff
, N_("add Signed-off-by:")),
242 /* Cleans up metadata that is uninteresting after a succeeded merge. */
243 static void drop_save(void)
245 unlink(git_path_merge_head());
246 unlink(git_path_merge_msg());
247 unlink(git_path_merge_mode());
250 static int save_state(struct object_id
*stash
)
253 struct child_process cp
= CHILD_PROCESS_INIT
;
254 struct strbuf buffer
= STRBUF_INIT
;
255 const char *argv
[] = {"stash", "create", NULL
};
262 if (start_command(&cp
))
263 die(_("could not run stash."));
264 len
= strbuf_read(&buffer
, cp
.out
, 1024);
267 if (finish_command(&cp
) || len
< 0)
268 die(_("stash failed"));
269 else if (!len
) /* no changes */
271 strbuf_setlen(&buffer
, buffer
.len
-1);
272 if (get_oid(buffer
.buf
, stash
))
273 die(_("not a valid object: %s"), buffer
.buf
);
276 strbuf_release(&buffer
);
280 static void read_empty(unsigned const char *sha1
, int verbose
)
285 args
[i
++] = "read-tree";
290 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
291 args
[i
++] = sha1_to_hex(sha1
);
294 if (run_command_v_opt(args
, RUN_GIT_CMD
))
295 die(_("read-tree failed"));
298 static void reset_hard(unsigned const char *sha1
, int verbose
)
303 args
[i
++] = "read-tree";
306 args
[i
++] = "--reset";
308 args
[i
++] = sha1_to_hex(sha1
);
311 if (run_command_v_opt(args
, RUN_GIT_CMD
))
312 die(_("read-tree failed"));
315 static void restore_state(const struct object_id
*head
,
316 const struct object_id
*stash
)
318 struct strbuf sb
= STRBUF_INIT
;
319 const char *args
[] = { "stash", "apply", NULL
, NULL
};
321 if (is_null_oid(stash
))
324 reset_hard(head
->hash
, 1);
326 args
[2] = oid_to_hex(stash
);
329 * It is OK to ignore error here, for example when there was
330 * nothing to restore.
332 run_command_v_opt(args
, RUN_GIT_CMD
);
335 refresh_cache(REFRESH_QUIET
);
338 /* This is called when no merge was necessary. */
339 static void finish_up_to_date(const char *msg
)
342 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
346 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
349 struct strbuf out
= STRBUF_INIT
;
350 struct commit_list
*j
;
351 struct pretty_print_context ctx
= {0};
353 printf(_("Squash commit -- not updating HEAD\n"));
355 init_revisions(&rev
, NULL
);
356 rev
.ignore_merges
= 1;
357 rev
.commit_format
= CMIT_FMT_MEDIUM
;
359 commit
->object
.flags
|= UNINTERESTING
;
360 add_pending_object(&rev
, &commit
->object
, NULL
);
362 for (j
= remoteheads
; j
; j
= j
->next
)
363 add_pending_object(&rev
, &j
->item
->object
, NULL
);
365 setup_revisions(0, NULL
, &rev
, NULL
);
366 if (prepare_revision_walk(&rev
))
367 die(_("revision walk setup failed"));
369 ctx
.abbrev
= rev
.abbrev
;
370 ctx
.date_mode
= rev
.date_mode
;
371 ctx
.fmt
= rev
.commit_format
;
373 strbuf_addstr(&out
, "Squashed commit of the following:\n");
374 while ((commit
= get_revision(&rev
)) != NULL
) {
375 strbuf_addch(&out
, '\n');
376 strbuf_addf(&out
, "commit %s\n",
377 oid_to_hex(&commit
->object
.oid
));
378 pretty_print_commit(&ctx
, commit
, &out
);
380 write_file_buf(git_path_squash_msg(), out
.buf
, out
.len
);
381 strbuf_release(&out
);
384 static void finish(struct commit
*head_commit
,
385 struct commit_list
*remoteheads
,
386 const struct object_id
*new_head
, const char *msg
)
388 struct strbuf reflog_message
= STRBUF_INIT
;
389 const struct object_id
*head
= &head_commit
->object
.oid
;
392 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
396 strbuf_addf(&reflog_message
, "%s: %s",
397 getenv("GIT_REFLOG_ACTION"), msg
);
400 squash_message(head_commit
, remoteheads
);
402 if (verbosity
>= 0 && !merge_msg
.len
)
403 printf(_("No merge message -- not updating HEAD\n"));
405 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
406 update_ref(reflog_message
.buf
, "HEAD",
407 new_head
->hash
, head
->hash
, 0,
408 UPDATE_REFS_DIE_ON_ERR
);
410 * We ignore errors in 'gc --auto', since the
411 * user should see them.
414 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
417 if (new_head
&& show_diffstat
) {
418 struct diff_options opts
;
420 opts
.stat_width
= -1; /* use full terminal width */
421 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
422 opts
.output_format
|=
423 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
424 opts
.detect_rename
= DIFF_DETECT_RENAME
;
425 diff_setup_done(&opts
);
426 diff_tree_oid(head
, new_head
, "", &opts
);
431 /* Run a post-merge hook */
432 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
434 strbuf_release(&reflog_message
);
437 /* Get the name for the merge commit's message. */
438 static void merge_name(const char *remote
, struct strbuf
*msg
)
440 struct commit
*remote_head
;
441 struct object_id branch_head
;
442 struct strbuf buf
= STRBUF_INIT
;
443 struct strbuf bname
= STRBUF_INIT
;
448 strbuf_branchname(&bname
, remote
, 0);
451 oidclr(&branch_head
);
452 remote_head
= get_merge_parent(remote
);
454 die(_("'%s' does not point to a commit"), remote
);
456 if (dwim_ref(remote
, strlen(remote
), branch_head
.hash
, &found_ref
) > 0) {
457 if (starts_with(found_ref
, "refs/heads/")) {
458 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
459 oid_to_hex(&branch_head
), remote
);
462 if (starts_with(found_ref
, "refs/tags/")) {
463 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
464 oid_to_hex(&branch_head
), remote
);
467 if (starts_with(found_ref
, "refs/remotes/")) {
468 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
469 oid_to_hex(&branch_head
), remote
);
474 /* See if remote matches <name>^^^.. or <name>~<number> */
475 for (len
= 0, ptr
= remote
+ strlen(remote
);
476 remote
< ptr
&& ptr
[-1] == '^';
483 ptr
= strrchr(remote
, '~');
485 int seen_nonzero
= 0;
488 while (*++ptr
&& isdigit(*ptr
)) {
489 seen_nonzero
|= (*ptr
!= '0');
493 len
= 0; /* not ...~<number> */
494 else if (seen_nonzero
)
497 early
= 1; /* "name~" is "name~1"! */
501 struct strbuf truname
= STRBUF_INIT
;
502 strbuf_addf(&truname
, "refs/heads/%s", remote
);
503 strbuf_setlen(&truname
, truname
.len
- len
);
504 if (ref_exists(truname
.buf
)) {
506 "%s\t\tbranch '%s'%s of .\n",
507 oid_to_hex(&remote_head
->object
.oid
),
509 (early
? " (early part)" : ""));
510 strbuf_release(&truname
);
513 strbuf_release(&truname
);
516 if (remote_head
->util
) {
517 struct merge_remote_desc
*desc
;
518 desc
= merge_remote_util(remote_head
);
519 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
520 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
521 oid_to_hex(&desc
->obj
->oid
),
522 typename(desc
->obj
->type
),
528 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
529 oid_to_hex(&remote_head
->object
.oid
), remote
);
531 strbuf_release(&buf
);
532 strbuf_release(&bname
);
535 static void parse_branch_merge_options(char *bmo
)
542 argc
= split_cmdline(bmo
, &argv
);
544 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
545 split_cmdline_strerror(argc
));
546 REALLOC_ARRAY(argv
, argc
+ 2);
547 MOVE_ARRAY(argv
+ 1, argv
, argc
+ 1);
549 argv
[0] = "branch.*.mergeoptions";
550 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
551 builtin_merge_usage
, 0);
555 static int git_merge_config(const char *k
, const char *v
, void *cb
)
559 if (branch
&& starts_with(k
, "branch.") &&
560 starts_with(k
+ 7, branch
) &&
561 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
562 free(branch_mergeoptions
);
563 branch_mergeoptions
= xstrdup(v
);
567 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
568 show_diffstat
= git_config_bool(k
, v
);
569 else if (!strcmp(k
, "pull.twohead"))
570 return git_config_string(&pull_twohead
, k
, v
);
571 else if (!strcmp(k
, "pull.octopus"))
572 return git_config_string(&pull_octopus
, k
, v
);
573 else if (!strcmp(k
, "merge.renormalize"))
574 option_renormalize
= git_config_bool(k
, v
);
575 else if (!strcmp(k
, "merge.ff")) {
576 int boolval
= git_parse_maybe_bool(v
);
578 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
579 } else if (v
&& !strcmp(v
, "only")) {
580 fast_forward
= FF_ONLY
;
581 } /* do not barf on values from future versions of git */
583 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
584 default_to_upstream
= git_config_bool(k
, v
);
586 } else if (!strcmp(k
, "commit.gpgsign")) {
587 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
591 status
= fmt_merge_msg_config(k
, v
, cb
);
594 status
= git_gpg_config(k
, v
, NULL
);
597 return git_diff_ui_config(k
, v
, cb
);
600 static int read_tree_trivial(struct object_id
*common
, struct object_id
*head
,
601 struct object_id
*one
)
604 struct tree
*trees
[MAX_UNPACK_TREES
];
605 struct tree_desc t
[MAX_UNPACK_TREES
];
606 struct unpack_trees_options opts
;
608 memset(&opts
, 0, sizeof(opts
));
610 opts
.src_index
= &the_index
;
611 opts
.dst_index
= &the_index
;
613 opts
.verbose_update
= 1;
614 opts
.trivial_merges_only
= 1;
616 trees
[nr_trees
] = parse_tree_indirect(common
);
617 if (!trees
[nr_trees
++])
619 trees
[nr_trees
] = parse_tree_indirect(head
);
620 if (!trees
[nr_trees
++])
622 trees
[nr_trees
] = parse_tree_indirect(one
);
623 if (!trees
[nr_trees
++])
625 opts
.fn
= threeway_merge
;
626 cache_tree_free(&active_cache_tree
);
627 for (i
= 0; i
< nr_trees
; i
++) {
628 parse_tree(trees
[i
]);
629 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
631 if (unpack_trees(nr_trees
, t
, &opts
))
636 static void write_tree_trivial(struct object_id
*oid
)
638 if (write_cache_as_tree(oid
->hash
, 0, NULL
))
639 die(_("git write-tree failed to write a tree"));
642 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
643 struct commit_list
*remoteheads
,
646 static struct lock_file lock
;
647 const char *head_arg
= "HEAD";
649 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
650 refresh_cache(REFRESH_QUIET
);
651 if (active_cache_changed
&&
652 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
653 return error(_("Unable to write index."));
654 rollback_lock_file(&lock
);
656 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
658 struct commit
*result
;
659 struct commit_list
*reversed
= NULL
;
660 struct merge_options o
;
661 struct commit_list
*j
;
663 if (remoteheads
->next
) {
664 error(_("Not handling anything other than two heads merge."));
668 init_merge_options(&o
);
669 if (!strcmp(strategy
, "subtree"))
670 o
.subtree_shift
= "";
672 o
.renormalize
= option_renormalize
;
673 o
.show_rename_progress
=
674 show_progress
== -1 ? isatty(2) : show_progress
;
676 for (x
= 0; x
< xopts_nr
; x
++)
677 if (parse_merge_opt(&o
, xopts
[x
]))
678 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
680 o
.branch1
= head_arg
;
681 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
683 for (j
= common
; j
; j
= j
->next
)
684 commit_list_insert(j
->item
, &reversed
);
686 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
687 clean
= merge_recursive(&o
, head
,
688 remoteheads
->item
, reversed
, &result
);
691 if (active_cache_changed
&&
692 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
693 die (_("unable to write %s"), get_index_file());
694 rollback_lock_file(&lock
);
695 return clean
? 0 : 1;
697 return try_merge_command(strategy
, xopts_nr
, xopts
,
698 common
, head_arg
, remoteheads
);
702 static void count_diff_files(struct diff_queue_struct
*q
,
703 struct diff_options
*opt
, void *data
)
710 static int count_unmerged_entries(void)
714 for (i
= 0; i
< active_nr
; i
++)
715 if (ce_stage(active_cache
[i
]))
721 static void add_strategies(const char *string
, unsigned attr
)
726 struct string_list list
= STRING_LIST_INIT_DUP
;
727 struct string_list_item
*item
;
728 string_list_split(&list
, string
, ' ', -1);
729 for_each_string_list_item(item
, &list
)
730 append_strategy(get_strategy(item
->string
));
731 string_list_clear(&list
, 0);
734 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
735 if (all_strategy
[i
].attr
& attr
)
736 append_strategy(&all_strategy
[i
]);
740 static void read_merge_msg(struct strbuf
*msg
)
742 const char *filename
= git_path_merge_msg();
744 if (strbuf_read_file(msg
, filename
, 0) < 0)
745 die_errno(_("Could not read from '%s'"), filename
);
748 static void write_merge_state(struct commit_list
*);
749 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
752 error("%s", err_msg
);
754 _("Not committing merge; use 'git commit' to complete the merge.\n"));
755 write_merge_state(remoteheads
);
759 static const char merge_editor_comment
[] =
760 N_("Please enter a commit message to explain why this merge is necessary,\n"
761 "especially if it merges an updated upstream into a topic branch.\n"
763 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
766 static void write_merge_heads(struct commit_list
*);
767 static void prepare_to_commit(struct commit_list
*remoteheads
)
769 struct strbuf msg
= STRBUF_INIT
;
770 strbuf_addbuf(&msg
, &merge_msg
);
771 strbuf_addch(&msg
, '\n');
773 BUG("the control must not reach here under --squash");
775 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
777 append_signoff(&msg
, ignore_non_trailer(msg
.buf
, msg
.len
), 0);
778 write_merge_heads(remoteheads
);
779 write_file_buf(git_path_merge_msg(), msg
.buf
, msg
.len
);
780 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
781 git_path_merge_msg(), "merge", NULL
))
782 abort_commit(remoteheads
, NULL
);
783 if (0 < option_edit
) {
784 if (launch_editor(git_path_merge_msg(), NULL
, NULL
))
785 abort_commit(remoteheads
, NULL
);
787 read_merge_msg(&msg
);
788 strbuf_stripspace(&msg
, 0 < option_edit
);
790 abort_commit(remoteheads
, _("Empty commit message."));
791 strbuf_release(&merge_msg
);
792 strbuf_addbuf(&merge_msg
, &msg
);
793 strbuf_release(&msg
);
796 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
798 struct object_id result_tree
, result_commit
;
799 struct commit_list
*parents
, **pptr
= &parents
;
800 static struct lock_file lock
;
802 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
803 refresh_cache(REFRESH_QUIET
);
804 if (active_cache_changed
&&
805 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
806 return error(_("Unable to write index."));
807 rollback_lock_file(&lock
);
809 write_tree_trivial(&result_tree
);
810 printf(_("Wonderful.\n"));
811 pptr
= commit_list_append(head
, pptr
);
812 pptr
= commit_list_append(remoteheads
->item
, pptr
);
813 prepare_to_commit(remoteheads
);
814 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
.hash
, parents
,
815 result_commit
.hash
, NULL
, sign_commit
))
816 die(_("failed to write commit object"));
817 finish(head
, remoteheads
, &result_commit
, "In-index merge");
822 static int finish_automerge(struct commit
*head
,
824 struct commit_list
*common
,
825 struct commit_list
*remoteheads
,
826 struct object_id
*result_tree
,
827 const char *wt_strategy
)
829 struct commit_list
*parents
= NULL
;
830 struct strbuf buf
= STRBUF_INIT
;
831 struct object_id result_commit
;
833 free_commit_list(common
);
834 parents
= remoteheads
;
835 if (!head_subsumed
|| fast_forward
== FF_NO
)
836 commit_list_insert(head
, &parents
);
837 strbuf_addch(&merge_msg
, '\n');
838 prepare_to_commit(remoteheads
);
839 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
->hash
, parents
,
840 result_commit
.hash
, NULL
, sign_commit
))
841 die(_("failed to write commit object"));
842 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
843 finish(head
, remoteheads
, &result_commit
, buf
.buf
);
844 strbuf_release(&buf
);
849 static int suggest_conflicts(void)
851 const char *filename
;
853 struct strbuf msgbuf
= STRBUF_INIT
;
855 filename
= git_path_merge_msg();
856 fp
= xfopen(filename
, "a");
858 append_conflicts_hint(&msgbuf
);
859 fputs(msgbuf
.buf
, fp
);
860 strbuf_release(&msgbuf
);
862 rerere(allow_rerere_auto
);
863 printf(_("Automatic merge failed; "
864 "fix conflicts and then commit the result.\n"));
868 static int evaluate_result(void)
873 /* Check how many files differ. */
874 init_revisions(&rev
, "");
875 setup_revisions(0, NULL
, &rev
, NULL
);
876 rev
.diffopt
.output_format
|=
877 DIFF_FORMAT_CALLBACK
;
878 rev
.diffopt
.format_callback
= count_diff_files
;
879 rev
.diffopt
.format_callback_data
= &cnt
;
880 run_diff_files(&rev
, 0);
883 * Check how many unmerged entries are
886 cnt
+= count_unmerged_entries();
892 * Pretend as if the user told us to merge with the remote-tracking
893 * branch we have for the upstream of the current branch
895 static int setup_with_upstream(const char ***argv
)
897 struct branch
*branch
= branch_get(NULL
);
902 die(_("No current branch."));
903 if (!branch
->remote_name
)
904 die(_("No remote for the current branch."));
905 if (!branch
->merge_nr
)
906 die(_("No default upstream defined for the current branch."));
908 args
= xcalloc(st_add(branch
->merge_nr
, 1), sizeof(char *));
909 for (i
= 0; i
< branch
->merge_nr
; i
++) {
910 if (!branch
->merge
[i
]->dst
)
911 die(_("No remote-tracking branch for %s from %s"),
912 branch
->merge
[i
]->src
, branch
->remote_name
);
913 args
[i
] = branch
->merge
[i
]->dst
;
920 static void write_merge_heads(struct commit_list
*remoteheads
)
922 struct commit_list
*j
;
923 struct strbuf buf
= STRBUF_INIT
;
925 for (j
= remoteheads
; j
; j
= j
->next
) {
926 struct object_id
*oid
;
927 struct commit
*c
= j
->item
;
928 if (c
->util
&& merge_remote_util(c
)->obj
) {
929 oid
= &merge_remote_util(c
)->obj
->oid
;
931 oid
= &c
->object
.oid
;
933 strbuf_addf(&buf
, "%s\n", oid_to_hex(oid
));
935 write_file_buf(git_path_merge_head(), buf
.buf
, buf
.len
);
938 if (fast_forward
== FF_NO
)
939 strbuf_addstr(&buf
, "no-ff");
940 write_file_buf(git_path_merge_mode(), buf
.buf
, buf
.len
);
943 static void write_merge_state(struct commit_list
*remoteheads
)
945 write_merge_heads(remoteheads
);
946 strbuf_addch(&merge_msg
, '\n');
947 write_file_buf(git_path_merge_msg(), merge_msg
.buf
, merge_msg
.len
);
950 static int default_edit_option(void)
952 static const char name
[] = "GIT_MERGE_AUTOEDIT";
953 const char *e
= getenv(name
);
954 struct stat st_stdin
, st_stdout
;
957 /* an explicit -m msg without --[no-]edit */
961 int v
= git_parse_maybe_bool(e
);
963 die(_("Bad value '%s' in environment '%s'"), e
, name
);
967 /* Use editor if stdin and stdout are the same and is a tty */
968 return (!fstat(0, &st_stdin
) &&
969 !fstat(1, &st_stdout
) &&
970 isatty(0) && isatty(1) &&
971 st_stdin
.st_dev
== st_stdout
.st_dev
&&
972 st_stdin
.st_ino
== st_stdout
.st_ino
&&
973 st_stdin
.st_mode
== st_stdout
.st_mode
);
976 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
978 struct commit_list
*remoteheads
)
980 struct commit_list
*parents
, **remotes
;
983 * Is the current HEAD reachable from another commit being
984 * merged? If so we do not want to record it as a parent of
985 * the resulting merge, unless --no-ff is given. We will flip
986 * this variable to 0 when we find HEAD among the independent
991 /* Find what parents to record by checking independent ones. */
992 parents
= reduce_heads(remoteheads
);
995 remotes
= &remoteheads
;
997 struct commit
*commit
= pop_commit(&parents
);
998 if (commit
== head_commit
)
1001 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1006 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
1008 struct fmt_merge_msg_opts opts
;
1010 memset(&opts
, 0, sizeof(opts
));
1011 opts
.add_title
= !have_message
;
1012 opts
.shortlog_len
= shortlog_len
;
1013 opts
.credit_people
= (0 < option_edit
);
1015 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1017 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1020 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1022 const char *filename
;
1024 struct strbuf fetch_head_file
= STRBUF_INIT
;
1027 merge_names
= &fetch_head_file
;
1029 filename
= git_path_fetch_head();
1030 fd
= open(filename
, O_RDONLY
);
1032 die_errno(_("could not open '%s' for reading"), filename
);
1034 if (strbuf_read(merge_names
, fd
, 0) < 0)
1035 die_errno(_("could not read '%s'"), filename
);
1037 die_errno(_("could not close '%s'"), filename
);
1039 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1040 struct object_id oid
;
1042 struct commit
*commit
;
1044 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1046 npos
= ptr
- merge_names
->buf
+ 1;
1048 npos
= merge_names
->len
;
1050 if (npos
- pos
< GIT_SHA1_HEXSZ
+ 2 ||
1051 get_oid_hex(merge_names
->buf
+ pos
, &oid
))
1052 commit
= NULL
; /* bad */
1053 else if (memcmp(merge_names
->buf
+ pos
+ GIT_SHA1_HEXSZ
, "\t\t", 2))
1054 continue; /* not-for-merge */
1056 char saved
= merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
];
1057 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = '\0';
1058 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1059 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = saved
;
1064 die(_("not something we can merge in %s: %s"),
1065 filename
, merge_names
->buf
+ pos
);
1067 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1070 if (merge_names
== &fetch_head_file
)
1071 strbuf_release(&fetch_head_file
);
1074 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1076 int argc
, const char **argv
,
1077 struct strbuf
*merge_msg
)
1080 struct commit_list
*remoteheads
= NULL
;
1081 struct commit_list
**remotes
= &remoteheads
;
1082 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1084 if (merge_msg
&& (!have_message
|| shortlog_len
))
1085 autogen
= &merge_names
;
1088 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1090 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1091 handle_fetch_head(remotes
, autogen
);
1092 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1094 for (i
= 0; i
< argc
; i
++) {
1095 struct commit
*commit
= get_merge_parent(argv
[i
]);
1097 help_unknown_ref(argv
[i
], "merge",
1098 _("not something we can merge"));
1099 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1101 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1103 struct commit_list
*p
;
1104 for (p
= remoteheads
; p
; p
= p
->next
)
1105 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1110 prepare_merge_message(autogen
, merge_msg
);
1111 strbuf_release(autogen
);
1117 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1119 struct object_id result_tree
, stash
, head_oid
;
1120 struct commit
*head_commit
;
1121 struct strbuf buf
= STRBUF_INIT
;
1122 int i
, ret
= 0, head_subsumed
;
1123 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1124 struct commit_list
*common
= NULL
;
1125 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1126 struct commit_list
*remoteheads
, *p
;
1127 void *branch_to_free
;
1128 int orig_argc
= argc
;
1130 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1131 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1134 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1137 branch
= branch_to_free
= resolve_refdup("HEAD", 0, head_oid
.hash
, NULL
);
1139 skip_prefix(branch
, "refs/heads/", &branch
);
1140 if (!branch
|| is_null_oid(&head_oid
))
1143 head_commit
= lookup_commit_or_die(&head_oid
, "HEAD");
1145 init_diff_ui_defaults();
1146 git_config(git_merge_config
, NULL
);
1148 if (branch_mergeoptions
)
1149 parse_branch_merge_options(branch_mergeoptions
);
1150 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1151 builtin_merge_usage
, 0);
1152 if (shortlog_len
< 0)
1153 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1155 if (verbosity
< 0 && show_progress
== -1)
1158 if (abort_current_merge
) {
1160 const char *nargv
[] = {"reset", "--merge", NULL
};
1163 usage_msg_opt(_("--abort expects no arguments"),
1164 builtin_merge_usage
, builtin_merge_options
);
1166 if (!file_exists(git_path_merge_head()))
1167 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1169 /* Invoke 'git reset --merge' */
1170 ret
= cmd_reset(nargc
, nargv
, prefix
);
1174 if (continue_current_merge
) {
1176 const char *nargv
[] = {"commit", NULL
};
1179 usage_msg_opt(_("--continue expects no arguments"),
1180 builtin_merge_usage
, builtin_merge_options
);
1182 if (!file_exists(git_path_merge_head()))
1183 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1185 /* Invoke 'git commit' */
1186 ret
= cmd_commit(nargc
, nargv
, prefix
);
1190 if (read_cache_unmerged())
1191 die_resolve_conflict("merge");
1193 if (file_exists(git_path_merge_head())) {
1195 * There is no unmerged entry, don't advise 'git
1196 * add/rm <file>', just 'git commit'.
1198 if (advice_resolve_conflict
)
1199 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1200 "Please, commit your changes before you merge."));
1202 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1204 if (file_exists(git_path_cherry_pick_head())) {
1205 if (advice_resolve_conflict
)
1206 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1207 "Please, commit your changes before you merge."));
1209 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1211 resolve_undo_clear();
1217 if (fast_forward
== FF_NO
)
1218 die(_("You cannot combine --squash with --no-ff."));
1223 if (default_to_upstream
)
1224 argc
= setup_with_upstream(&argv
);
1226 die(_("No commit specified and merge.defaultToUpstream not set."));
1227 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1232 usage_with_options(builtin_merge_usage
,
1233 builtin_merge_options
);
1237 * If the merged head is a valid one there is no reason
1238 * to forbid "git merge" into a branch yet to be born.
1239 * We do the same for "git pull".
1241 struct object_id
*remote_head_oid
;
1243 die(_("Squash commit into empty head not supported yet"));
1244 if (fast_forward
== FF_NO
)
1245 die(_("Non-fast-forward commit does not make sense into "
1247 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1250 die(_("%s - not something we can merge"), argv
[0]);
1251 if (remoteheads
->next
)
1252 die(_("Can merge only exactly one commit into empty head"));
1253 remote_head_oid
= &remoteheads
->item
->object
.oid
;
1254 read_empty(remote_head_oid
->hash
, 0);
1255 update_ref("initial pull", "HEAD", remote_head_oid
->hash
,
1256 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1261 * All the rest are the commits being merged; prepare
1262 * the standard merge summary message to be appended
1263 * to the given message.
1265 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1266 argc
, argv
, &merge_msg
);
1268 if (!head_commit
|| !argc
)
1269 usage_with_options(builtin_merge_usage
,
1270 builtin_merge_options
);
1272 if (verify_signatures
) {
1273 for (p
= remoteheads
; p
; p
= p
->next
) {
1274 struct commit
*commit
= p
->item
;
1275 char hex
[GIT_MAX_HEXSZ
+ 1];
1276 struct signature_check signature_check
;
1277 memset(&signature_check
, 0, sizeof(signature_check
));
1279 check_commit_signature(commit
, &signature_check
);
1281 find_unique_abbrev_r(hex
, commit
->object
.oid
.hash
, DEFAULT_ABBREV
);
1282 switch (signature_check
.result
) {
1286 die(_("Commit %s has an untrusted GPG signature, "
1287 "allegedly by %s."), hex
, signature_check
.signer
);
1289 die(_("Commit %s has a bad GPG signature "
1290 "allegedly by %s."), hex
, signature_check
.signer
);
1292 die(_("Commit %s does not have a GPG signature."), hex
);
1294 if (verbosity
>= 0 && signature_check
.result
== 'G')
1295 printf(_("Commit %s has a good GPG signature by %s\n"),
1296 hex
, signature_check
.signer
);
1298 signature_check_clear(&signature_check
);
1302 strbuf_addstr(&buf
, "merge");
1303 for (p
= remoteheads
; p
; p
= p
->next
)
1304 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1305 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1308 for (p
= remoteheads
; p
; p
= p
->next
) {
1309 struct commit
*commit
= p
->item
;
1310 strbuf_addf(&buf
, "GITHEAD_%s",
1311 oid_to_hex(&commit
->object
.oid
));
1312 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1314 if (fast_forward
!= FF_ONLY
&&
1315 merge_remote_util(commit
) &&
1316 merge_remote_util(commit
)->obj
&&
1317 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1318 fast_forward
= FF_NO
;
1321 if (option_edit
< 0)
1322 option_edit
= default_edit_option();
1324 if (!use_strategies
) {
1326 ; /* already up-to-date */
1327 else if (!remoteheads
->next
)
1328 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1330 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1333 for (i
= 0; i
< use_strategies_nr
; i
++) {
1334 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1335 fast_forward
= FF_NO
;
1336 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1341 ; /* already up-to-date */
1342 else if (!remoteheads
->next
)
1343 common
= get_merge_bases(head_commit
, remoteheads
->item
);
1345 struct commit_list
*list
= remoteheads
;
1346 commit_list_insert(head_commit
, &list
);
1347 common
= get_octopus_merge_bases(list
);
1351 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.oid
.hash
,
1352 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1354 if (remoteheads
&& !common
) {
1355 /* No common ancestors found. */
1356 if (!allow_unrelated_histories
)
1357 die(_("refusing to merge unrelated histories"));
1358 /* otherwise, we need a real merge. */
1359 } else if (!remoteheads
||
1360 (!remoteheads
->next
&& !common
->next
&&
1361 common
->item
== remoteheads
->item
)) {
1363 * If head can reach all the merge then we are up to date.
1364 * but first the most common case of merging one remote.
1366 finish_up_to_date(_("Already up-to-date."));
1368 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1370 !oidcmp(&common
->item
->object
.oid
, &head_commit
->object
.oid
)) {
1371 /* Again the most common case of merging one remote. */
1372 struct strbuf msg
= STRBUF_INIT
;
1373 struct commit
*commit
;
1375 if (verbosity
>= 0) {
1376 printf(_("Updating %s..%s\n"),
1377 find_unique_abbrev(head_commit
->object
.oid
.hash
,
1379 find_unique_abbrev(remoteheads
->item
->object
.oid
.hash
,
1382 strbuf_addstr(&msg
, "Fast-forward");
1385 " (no commit created; -m option ignored)");
1386 commit
= remoteheads
->item
;
1392 if (checkout_fast_forward(&head_commit
->object
.oid
,
1393 &commit
->object
.oid
,
1394 overwrite_ignore
)) {
1399 finish(head_commit
, remoteheads
, &commit
->object
.oid
, msg
.buf
);
1402 } else if (!remoteheads
->next
&& common
->next
)
1405 * We are not doing octopus and not fast-forward. Need
1408 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1410 * We are not doing octopus, not fast-forward, and have
1413 refresh_cache(REFRESH_QUIET
);
1414 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1415 /* See if it is really trivial. */
1416 git_committer_info(IDENT_STRICT
);
1417 printf(_("Trying really trivial in-index merge...\n"));
1418 if (!read_tree_trivial(&common
->item
->object
.oid
,
1419 &head_commit
->object
.oid
,
1420 &remoteheads
->item
->object
.oid
)) {
1421 ret
= merge_trivial(head_commit
, remoteheads
);
1424 printf(_("Nope.\n"));
1428 * An octopus. If we can reach all the remote we are up
1432 struct commit_list
*j
;
1434 for (j
= remoteheads
; j
; j
= j
->next
) {
1435 struct commit_list
*common_one
;
1438 * Here we *have* to calculate the individual
1439 * merge_bases again, otherwise "git merge HEAD^
1440 * HEAD^^" would be missed.
1442 common_one
= get_merge_bases(head_commit
, j
->item
);
1443 if (oidcmp(&common_one
->item
->object
.oid
, &j
->item
->object
.oid
)) {
1449 finish_up_to_date(_("Already up-to-date. Yeeah!"));
1454 if (fast_forward
== FF_ONLY
)
1455 die(_("Not possible to fast-forward, aborting."));
1457 /* We are going to make a new commit. */
1458 git_committer_info(IDENT_STRICT
);
1461 * At this point, we need a real merge. No matter what strategy
1462 * we use, it would operate on the index, possibly affecting the
1463 * working tree, and when resolved cleanly, have the desired
1464 * tree in the index -- this means that the index must be in
1465 * sync with the head commit. The strategies are responsible
1468 if (use_strategies_nr
== 1 ||
1470 * Stash away the local changes so that we can try more than one.
1475 for (i
= 0; i
< use_strategies_nr
; i
++) {
1478 printf(_("Rewinding the tree to pristine...\n"));
1479 restore_state(&head_commit
->object
.oid
, &stash
);
1481 if (use_strategies_nr
!= 1)
1482 printf(_("Trying merge strategy %s...\n"),
1483 use_strategies
[i
]->name
);
1485 * Remember which strategy left the state in the working
1488 wt_strategy
= use_strategies
[i
]->name
;
1490 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1491 common
, remoteheads
,
1493 if (!option_commit
&& !ret
) {
1496 * This is necessary here just to avoid writing
1497 * the tree, but later we will *not* exit with
1498 * status code 1 because merge_was_ok is set.
1505 * The backend exits with 1 when conflicts are
1506 * left to be resolved, with 2 when it does not
1507 * handle the given merge at all.
1510 int cnt
= evaluate_result();
1512 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1513 best_strategy
= use_strategies
[i
]->name
;
1523 /* Automerge succeeded. */
1524 write_tree_trivial(&result_tree
);
1525 automerge_was_ok
= 1;
1530 * If we have a resulting tree, that means the strategy module
1531 * auto resolved the merge cleanly.
1533 if (automerge_was_ok
) {
1534 ret
= finish_automerge(head_commit
, head_subsumed
,
1535 common
, remoteheads
,
1536 &result_tree
, wt_strategy
);
1541 * Pick the result from the best strategy and have the user fix
1544 if (!best_strategy
) {
1545 restore_state(&head_commit
->object
.oid
, &stash
);
1546 if (use_strategies_nr
> 1)
1548 _("No merge strategy handled the merge.\n"));
1550 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1551 use_strategies
[0]->name
);
1554 } else if (best_strategy
== wt_strategy
)
1555 ; /* We already have its result in the working tree. */
1557 printf(_("Rewinding the tree to pristine...\n"));
1558 restore_state(&head_commit
->object
.oid
, &stash
);
1559 printf(_("Using the %s to prepare resolving by hand.\n"),
1561 try_merge_strategy(best_strategy
, common
, remoteheads
,
1566 finish(head_commit
, remoteheads
, NULL
, NULL
);
1568 write_merge_state(remoteheads
);
1571 fprintf(stderr
, _("Automatic merge went well; "
1572 "stopped before committing as requested\n"));
1574 ret
= suggest_conflicts();
1577 free(branch_to_free
);