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"
36 #define DEFAULT_TWOHEAD (1<<0)
37 #define DEFAULT_OCTOPUS (1<<1)
38 #define NO_FAST_FORWARD (1<<2)
39 #define NO_TRIVIAL (1<<3)
46 static const char * const builtin_merge_usage
[] = {
47 N_("git merge [<options>] [<commit>...]"),
48 N_("git merge --abort"),
49 N_("git merge --continue"),
53 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
54 static int option_commit
= 1;
55 static int option_edit
= -1;
56 static int allow_trivial
= 1, have_message
, verify_signatures
;
57 static int overwrite_ignore
= 1;
58 static struct strbuf merge_msg
= STRBUF_INIT
;
59 static struct strategy
**use_strategies
;
60 static size_t use_strategies_nr
, use_strategies_alloc
;
61 static const char **xopts
;
62 static size_t xopts_nr
, xopts_alloc
;
63 static const char *branch
;
64 static char *branch_mergeoptions
;
65 static int option_renormalize
;
67 static int allow_rerere_auto
;
68 static int abort_current_merge
;
69 static int continue_current_merge
;
70 static int allow_unrelated_histories
;
71 static int show_progress
= -1;
72 static int default_to_upstream
= 1;
74 static const char *sign_commit
;
76 static struct strategy all_strategy
[] = {
77 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
78 { "octopus", DEFAULT_OCTOPUS
},
80 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
81 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
84 static const char *pull_twohead
, *pull_octopus
;
92 static enum ff_type fast_forward
= FF_ALLOW
;
94 static int option_parse_message(const struct option
*opt
,
95 const char *arg
, int unset
)
97 struct strbuf
*buf
= opt
->value
;
100 strbuf_setlen(buf
, 0);
102 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
105 return error(_("switch `m' requires a value"));
109 static struct strategy
*get_strategy(const char *name
)
112 struct strategy
*ret
;
113 static struct cmdnames main_cmds
, other_cmds
;
119 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
120 if (!strcmp(name
, all_strategy
[i
].name
))
121 return &all_strategy
[i
];
124 struct cmdnames not_strategies
;
127 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
128 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
129 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
131 struct cmdname
*ent
= main_cmds
.names
[i
];
132 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
133 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
134 && !all_strategy
[j
].name
[ent
->len
])
137 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
139 exclude_cmds(&main_cmds
, ¬_strategies
);
141 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
142 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
143 fprintf(stderr
, _("Available strategies are:"));
144 for (i
= 0; i
< main_cmds
.cnt
; i
++)
145 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
146 fprintf(stderr
, ".\n");
147 if (other_cmds
.cnt
) {
148 fprintf(stderr
, _("Available custom strategies are:"));
149 for (i
= 0; i
< other_cmds
.cnt
; i
++)
150 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
151 fprintf(stderr
, ".\n");
156 ret
= xcalloc(1, sizeof(struct strategy
));
157 ret
->name
= xstrdup(name
);
158 ret
->attr
= NO_TRIVIAL
;
162 static void append_strategy(struct strategy
*s
)
164 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
165 use_strategies
[use_strategies_nr
++] = s
;
168 static int option_parse_strategy(const struct option
*opt
,
169 const char *name
, int unset
)
174 append_strategy(get_strategy(name
));
178 static int option_parse_x(const struct option
*opt
,
179 const char *arg
, int unset
)
184 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
185 xopts
[xopts_nr
++] = xstrdup(arg
);
189 static int option_parse_n(const struct option
*opt
,
190 const char *arg
, int unset
)
192 show_diffstat
= unset
;
196 static struct option builtin_merge_options
[] = {
197 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
198 N_("do not show a diffstat at the end of the merge"),
199 PARSE_OPT_NOARG
, option_parse_n
},
200 OPT_BOOL(0, "stat", &show_diffstat
,
201 N_("show a diffstat at the end of the merge")),
202 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
203 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
204 N_("add (at most <n>) entries from shortlog to merge commit message"),
205 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
206 OPT_BOOL(0, "squash", &squash
,
207 N_("create a single commit instead of doing a merge")),
208 OPT_BOOL(0, "commit", &option_commit
,
209 N_("perform a commit if the merge succeeds (default)")),
210 OPT_BOOL('e', "edit", &option_edit
,
211 N_("edit message before committing")),
212 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
213 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
214 N_("abort if fast-forward is not possible"),
215 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
216 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
217 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
218 N_("verify that the named commit has a valid GPG signature")),
219 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
220 N_("merge strategy to use"), option_parse_strategy
),
221 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
222 N_("option for selected merge strategy"), option_parse_x
),
223 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
224 N_("merge commit message (for a non-fast-forward merge)"),
225 option_parse_message
),
226 OPT__VERBOSITY(&verbosity
),
227 OPT_BOOL(0, "abort", &abort_current_merge
,
228 N_("abort the current in-progress merge")),
229 OPT_BOOL(0, "continue", &continue_current_merge
,
230 N_("continue the current in-progress merge")),
231 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories
,
232 N_("allow merging unrelated histories")),
233 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
234 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
235 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
236 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
237 OPT_BOOL(0, "signoff", &signoff
, N_("add Signed-off-by:")),
241 /* Cleans up metadata that is uninteresting after a succeeded merge. */
242 static void drop_save(void)
244 unlink(git_path_merge_head());
245 unlink(git_path_merge_msg());
246 unlink(git_path_merge_mode());
249 static int save_state(struct object_id
*stash
)
252 struct child_process cp
= CHILD_PROCESS_INIT
;
253 struct strbuf buffer
= STRBUF_INIT
;
254 const char *argv
[] = {"stash", "create", NULL
};
260 if (start_command(&cp
))
261 die(_("could not run stash."));
262 len
= strbuf_read(&buffer
, cp
.out
, 1024);
265 if (finish_command(&cp
) || len
< 0)
266 die(_("stash failed"));
267 else if (!len
) /* no changes */
269 strbuf_setlen(&buffer
, buffer
.len
-1);
270 if (get_oid(buffer
.buf
, stash
))
271 die(_("not a valid object: %s"), buffer
.buf
);
275 static void read_empty(unsigned const char *sha1
, int verbose
)
280 args
[i
++] = "read-tree";
285 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
286 args
[i
++] = sha1_to_hex(sha1
);
289 if (run_command_v_opt(args
, RUN_GIT_CMD
))
290 die(_("read-tree failed"));
293 static void reset_hard(unsigned const char *sha1
, int verbose
)
298 args
[i
++] = "read-tree";
301 args
[i
++] = "--reset";
303 args
[i
++] = sha1_to_hex(sha1
);
306 if (run_command_v_opt(args
, RUN_GIT_CMD
))
307 die(_("read-tree failed"));
310 static void restore_state(const struct object_id
*head
,
311 const struct object_id
*stash
)
313 struct strbuf sb
= STRBUF_INIT
;
314 const char *args
[] = { "stash", "apply", NULL
, NULL
};
316 if (is_null_oid(stash
))
319 reset_hard(head
->hash
, 1);
321 args
[2] = oid_to_hex(stash
);
324 * It is OK to ignore error here, for example when there was
325 * nothing to restore.
327 run_command_v_opt(args
, RUN_GIT_CMD
);
330 refresh_cache(REFRESH_QUIET
);
333 /* This is called when no merge was necessary. */
334 static void finish_up_to_date(const char *msg
)
337 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
341 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
344 struct strbuf out
= STRBUF_INIT
;
345 struct commit_list
*j
;
346 struct pretty_print_context ctx
= {0};
348 printf(_("Squash commit -- not updating HEAD\n"));
350 init_revisions(&rev
, NULL
);
351 rev
.ignore_merges
= 1;
352 rev
.commit_format
= CMIT_FMT_MEDIUM
;
354 commit
->object
.flags
|= UNINTERESTING
;
355 add_pending_object(&rev
, &commit
->object
, NULL
);
357 for (j
= remoteheads
; j
; j
= j
->next
)
358 add_pending_object(&rev
, &j
->item
->object
, NULL
);
360 setup_revisions(0, NULL
, &rev
, NULL
);
361 if (prepare_revision_walk(&rev
))
362 die(_("revision walk setup failed"));
364 ctx
.abbrev
= rev
.abbrev
;
365 ctx
.date_mode
= rev
.date_mode
;
366 ctx
.fmt
= rev
.commit_format
;
368 strbuf_addstr(&out
, "Squashed commit of the following:\n");
369 while ((commit
= get_revision(&rev
)) != NULL
) {
370 strbuf_addch(&out
, '\n');
371 strbuf_addf(&out
, "commit %s\n",
372 oid_to_hex(&commit
->object
.oid
));
373 pretty_print_commit(&ctx
, commit
, &out
);
375 write_file_buf(git_path_squash_msg(), out
.buf
, out
.len
);
376 strbuf_release(&out
);
379 static void finish(struct commit
*head_commit
,
380 struct commit_list
*remoteheads
,
381 const struct object_id
*new_head
, const char *msg
)
383 struct strbuf reflog_message
= STRBUF_INIT
;
384 const struct object_id
*head
= &head_commit
->object
.oid
;
387 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
391 strbuf_addf(&reflog_message
, "%s: %s",
392 getenv("GIT_REFLOG_ACTION"), msg
);
395 squash_message(head_commit
, remoteheads
);
397 if (verbosity
>= 0 && !merge_msg
.len
)
398 printf(_("No merge message -- not updating HEAD\n"));
400 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
401 update_ref(reflog_message
.buf
, "HEAD",
402 new_head
->hash
, head
->hash
, 0,
403 UPDATE_REFS_DIE_ON_ERR
);
405 * We ignore errors in 'gc --auto', since the
406 * user should see them.
409 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
412 if (new_head
&& show_diffstat
) {
413 struct diff_options opts
;
415 opts
.stat_width
= -1; /* use full terminal width */
416 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
417 opts
.output_format
|=
418 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
419 opts
.detect_rename
= DIFF_DETECT_RENAME
;
420 diff_setup_done(&opts
);
421 diff_tree_oid(head
, new_head
, "", &opts
);
426 /* Run a post-merge hook */
427 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
429 strbuf_release(&reflog_message
);
432 /* Get the name for the merge commit's message. */
433 static void merge_name(const char *remote
, struct strbuf
*msg
)
435 struct commit
*remote_head
;
436 struct object_id branch_head
;
437 struct strbuf buf
= STRBUF_INIT
;
438 struct strbuf bname
= STRBUF_INIT
;
443 strbuf_branchname(&bname
, remote
, 0);
446 oidclr(&branch_head
);
447 remote_head
= get_merge_parent(remote
);
449 die(_("'%s' does not point to a commit"), remote
);
451 if (dwim_ref(remote
, strlen(remote
), branch_head
.hash
, &found_ref
) > 0) {
452 if (starts_with(found_ref
, "refs/heads/")) {
453 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
454 oid_to_hex(&branch_head
), remote
);
457 if (starts_with(found_ref
, "refs/tags/")) {
458 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
459 oid_to_hex(&branch_head
), remote
);
462 if (starts_with(found_ref
, "refs/remotes/")) {
463 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
464 oid_to_hex(&branch_head
), remote
);
469 /* See if remote matches <name>^^^.. or <name>~<number> */
470 for (len
= 0, ptr
= remote
+ strlen(remote
);
471 remote
< ptr
&& ptr
[-1] == '^';
478 ptr
= strrchr(remote
, '~');
480 int seen_nonzero
= 0;
483 while (*++ptr
&& isdigit(*ptr
)) {
484 seen_nonzero
|= (*ptr
!= '0');
488 len
= 0; /* not ...~<number> */
489 else if (seen_nonzero
)
492 early
= 1; /* "name~" is "name~1"! */
496 struct strbuf truname
= STRBUF_INIT
;
497 strbuf_addf(&truname
, "refs/heads/%s", remote
);
498 strbuf_setlen(&truname
, truname
.len
- len
);
499 if (ref_exists(truname
.buf
)) {
501 "%s\t\tbranch '%s'%s of .\n",
502 oid_to_hex(&remote_head
->object
.oid
),
504 (early
? " (early part)" : ""));
505 strbuf_release(&truname
);
508 strbuf_release(&truname
);
511 if (remote_head
->util
) {
512 struct merge_remote_desc
*desc
;
513 desc
= merge_remote_util(remote_head
);
514 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
515 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
516 oid_to_hex(&desc
->obj
->oid
),
517 typename(desc
->obj
->type
),
523 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
524 oid_to_hex(&remote_head
->object
.oid
), remote
);
526 strbuf_release(&buf
);
527 strbuf_release(&bname
);
530 static void parse_branch_merge_options(char *bmo
)
537 argc
= split_cmdline(bmo
, &argv
);
539 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
540 split_cmdline_strerror(argc
));
541 REALLOC_ARRAY(argv
, argc
+ 2);
542 MOVE_ARRAY(argv
+ 1, argv
, argc
+ 1);
544 argv
[0] = "branch.*.mergeoptions";
545 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
546 builtin_merge_usage
, 0);
550 static int git_merge_config(const char *k
, const char *v
, void *cb
)
554 if (branch
&& starts_with(k
, "branch.") &&
555 starts_with(k
+ 7, branch
) &&
556 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
557 free(branch_mergeoptions
);
558 branch_mergeoptions
= xstrdup(v
);
562 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
563 show_diffstat
= git_config_bool(k
, v
);
564 else if (!strcmp(k
, "pull.twohead"))
565 return git_config_string(&pull_twohead
, k
, v
);
566 else if (!strcmp(k
, "pull.octopus"))
567 return git_config_string(&pull_octopus
, k
, v
);
568 else if (!strcmp(k
, "merge.renormalize"))
569 option_renormalize
= git_config_bool(k
, v
);
570 else if (!strcmp(k
, "merge.ff")) {
571 int boolval
= git_parse_maybe_bool(v
);
573 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
574 } else if (v
&& !strcmp(v
, "only")) {
575 fast_forward
= FF_ONLY
;
576 } /* do not barf on values from future versions of git */
578 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
579 default_to_upstream
= git_config_bool(k
, v
);
581 } else if (!strcmp(k
, "commit.gpgsign")) {
582 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
586 status
= fmt_merge_msg_config(k
, v
, cb
);
589 status
= git_gpg_config(k
, v
, NULL
);
592 return git_diff_ui_config(k
, v
, cb
);
595 static int read_tree_trivial(struct object_id
*common
, struct object_id
*head
,
596 struct object_id
*one
)
599 struct tree
*trees
[MAX_UNPACK_TREES
];
600 struct tree_desc t
[MAX_UNPACK_TREES
];
601 struct unpack_trees_options opts
;
603 memset(&opts
, 0, sizeof(opts
));
605 opts
.src_index
= &the_index
;
606 opts
.dst_index
= &the_index
;
608 opts
.verbose_update
= 1;
609 opts
.trivial_merges_only
= 1;
611 trees
[nr_trees
] = parse_tree_indirect(common
);
612 if (!trees
[nr_trees
++])
614 trees
[nr_trees
] = parse_tree_indirect(head
);
615 if (!trees
[nr_trees
++])
617 trees
[nr_trees
] = parse_tree_indirect(one
);
618 if (!trees
[nr_trees
++])
620 opts
.fn
= threeway_merge
;
621 cache_tree_free(&active_cache_tree
);
622 for (i
= 0; i
< nr_trees
; i
++) {
623 parse_tree(trees
[i
]);
624 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
626 if (unpack_trees(nr_trees
, t
, &opts
))
631 static void write_tree_trivial(struct object_id
*oid
)
633 if (write_cache_as_tree(oid
->hash
, 0, NULL
))
634 die(_("git write-tree failed to write a tree"));
637 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
638 struct commit_list
*remoteheads
,
641 static struct lock_file lock
;
642 const char *head_arg
= "HEAD";
644 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
645 refresh_cache(REFRESH_QUIET
);
646 if (active_cache_changed
&&
647 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
648 return error(_("Unable to write index."));
649 rollback_lock_file(&lock
);
651 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
653 struct commit
*result
;
654 struct commit_list
*reversed
= NULL
;
655 struct merge_options o
;
656 struct commit_list
*j
;
658 if (remoteheads
->next
) {
659 error(_("Not handling anything other than two heads merge."));
663 init_merge_options(&o
);
664 if (!strcmp(strategy
, "subtree"))
665 o
.subtree_shift
= "";
667 o
.renormalize
= option_renormalize
;
668 o
.show_rename_progress
=
669 show_progress
== -1 ? isatty(2) : show_progress
;
671 for (x
= 0; x
< xopts_nr
; x
++)
672 if (parse_merge_opt(&o
, xopts
[x
]))
673 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
675 o
.branch1
= head_arg
;
676 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
678 for (j
= common
; j
; j
= j
->next
)
679 commit_list_insert(j
->item
, &reversed
);
681 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
682 clean
= merge_recursive(&o
, head
,
683 remoteheads
->item
, reversed
, &result
);
686 if (active_cache_changed
&&
687 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
688 die (_("unable to write %s"), get_index_file());
689 rollback_lock_file(&lock
);
690 return clean
? 0 : 1;
692 return try_merge_command(strategy
, xopts_nr
, xopts
,
693 common
, head_arg
, remoteheads
);
697 static void count_diff_files(struct diff_queue_struct
*q
,
698 struct diff_options
*opt
, void *data
)
705 static int count_unmerged_entries(void)
709 for (i
= 0; i
< active_nr
; i
++)
710 if (ce_stage(active_cache
[i
]))
716 static void add_strategies(const char *string
, unsigned attr
)
721 struct string_list list
= STRING_LIST_INIT_DUP
;
722 struct string_list_item
*item
;
723 string_list_split(&list
, string
, ' ', -1);
724 for_each_string_list_item(item
, &list
)
725 append_strategy(get_strategy(item
->string
));
726 string_list_clear(&list
, 0);
729 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
730 if (all_strategy
[i
].attr
& attr
)
731 append_strategy(&all_strategy
[i
]);
735 static void read_merge_msg(struct strbuf
*msg
)
737 const char *filename
= git_path_merge_msg();
739 if (strbuf_read_file(msg
, filename
, 0) < 0)
740 die_errno(_("Could not read from '%s'"), filename
);
743 static void write_merge_state(struct commit_list
*);
744 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
747 error("%s", err_msg
);
749 _("Not committing merge; use 'git commit' to complete the merge.\n"));
750 write_merge_state(remoteheads
);
754 static const char merge_editor_comment
[] =
755 N_("Please enter a commit message to explain why this merge is necessary,\n"
756 "especially if it merges an updated upstream into a topic branch.\n"
758 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
761 static void prepare_to_commit(struct commit_list
*remoteheads
)
763 struct strbuf msg
= STRBUF_INIT
;
764 strbuf_addbuf(&msg
, &merge_msg
);
765 strbuf_addch(&msg
, '\n');
767 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
769 append_signoff(&msg
, ignore_non_trailer(msg
.buf
, msg
.len
), 0);
770 write_file_buf(git_path_merge_msg(), msg
.buf
, msg
.len
);
771 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
772 git_path_merge_msg(), "merge", NULL
))
773 abort_commit(remoteheads
, NULL
);
774 if (0 < option_edit
) {
775 if (launch_editor(git_path_merge_msg(), NULL
, NULL
))
776 abort_commit(remoteheads
, NULL
);
778 read_merge_msg(&msg
);
779 strbuf_stripspace(&msg
, 0 < option_edit
);
781 abort_commit(remoteheads
, _("Empty commit message."));
782 strbuf_release(&merge_msg
);
783 strbuf_addbuf(&merge_msg
, &msg
);
784 strbuf_release(&msg
);
787 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
789 struct object_id result_tree
, result_commit
;
790 struct commit_list
*parents
, **pptr
= &parents
;
791 static struct lock_file lock
;
793 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
794 refresh_cache(REFRESH_QUIET
);
795 if (active_cache_changed
&&
796 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
797 return error(_("Unable to write index."));
798 rollback_lock_file(&lock
);
800 write_tree_trivial(&result_tree
);
801 printf(_("Wonderful.\n"));
802 pptr
= commit_list_append(head
, pptr
);
803 pptr
= commit_list_append(remoteheads
->item
, pptr
);
804 prepare_to_commit(remoteheads
);
805 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
.hash
, parents
,
806 result_commit
.hash
, NULL
, sign_commit
))
807 die(_("failed to write commit object"));
808 finish(head
, remoteheads
, &result_commit
, "In-index merge");
813 static int finish_automerge(struct commit
*head
,
815 struct commit_list
*common
,
816 struct commit_list
*remoteheads
,
817 struct object_id
*result_tree
,
818 const char *wt_strategy
)
820 struct commit_list
*parents
= NULL
;
821 struct strbuf buf
= STRBUF_INIT
;
822 struct object_id result_commit
;
824 free_commit_list(common
);
825 parents
= remoteheads
;
826 if (!head_subsumed
|| fast_forward
== FF_NO
)
827 commit_list_insert(head
, &parents
);
828 strbuf_addch(&merge_msg
, '\n');
829 prepare_to_commit(remoteheads
);
830 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
->hash
, parents
,
831 result_commit
.hash
, NULL
, sign_commit
))
832 die(_("failed to write commit object"));
833 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
834 finish(head
, remoteheads
, &result_commit
, buf
.buf
);
835 strbuf_release(&buf
);
840 static int suggest_conflicts(void)
842 const char *filename
;
844 struct strbuf msgbuf
= STRBUF_INIT
;
846 filename
= git_path_merge_msg();
847 fp
= xfopen(filename
, "a");
849 append_conflicts_hint(&msgbuf
);
850 fputs(msgbuf
.buf
, fp
);
851 strbuf_release(&msgbuf
);
853 rerere(allow_rerere_auto
);
854 printf(_("Automatic merge failed; "
855 "fix conflicts and then commit the result.\n"));
859 static int evaluate_result(void)
864 /* Check how many files differ. */
865 init_revisions(&rev
, "");
866 setup_revisions(0, NULL
, &rev
, NULL
);
867 rev
.diffopt
.output_format
|=
868 DIFF_FORMAT_CALLBACK
;
869 rev
.diffopt
.format_callback
= count_diff_files
;
870 rev
.diffopt
.format_callback_data
= &cnt
;
871 run_diff_files(&rev
, 0);
874 * Check how many unmerged entries are
877 cnt
+= count_unmerged_entries();
883 * Pretend as if the user told us to merge with the remote-tracking
884 * branch we have for the upstream of the current branch
886 static int setup_with_upstream(const char ***argv
)
888 struct branch
*branch
= branch_get(NULL
);
893 die(_("No current branch."));
894 if (!branch
->remote_name
)
895 die(_("No remote for the current branch."));
896 if (!branch
->merge_nr
)
897 die(_("No default upstream defined for the current branch."));
899 args
= xcalloc(st_add(branch
->merge_nr
, 1), sizeof(char *));
900 for (i
= 0; i
< branch
->merge_nr
; i
++) {
901 if (!branch
->merge
[i
]->dst
)
902 die(_("No remote-tracking branch for %s from %s"),
903 branch
->merge
[i
]->src
, branch
->remote_name
);
904 args
[i
] = branch
->merge
[i
]->dst
;
911 static void write_merge_state(struct commit_list
*remoteheads
)
913 struct commit_list
*j
;
914 struct strbuf buf
= STRBUF_INIT
;
916 for (j
= remoteheads
; j
; j
= j
->next
) {
917 struct object_id
*oid
;
918 struct commit
*c
= j
->item
;
919 if (c
->util
&& merge_remote_util(c
)->obj
) {
920 oid
= &merge_remote_util(c
)->obj
->oid
;
922 oid
= &c
->object
.oid
;
924 strbuf_addf(&buf
, "%s\n", oid_to_hex(oid
));
926 write_file_buf(git_path_merge_head(), buf
.buf
, buf
.len
);
927 strbuf_addch(&merge_msg
, '\n');
928 write_file_buf(git_path_merge_msg(), merge_msg
.buf
, merge_msg
.len
);
931 if (fast_forward
== FF_NO
)
932 strbuf_addstr(&buf
, "no-ff");
933 write_file_buf(git_path_merge_mode(), buf
.buf
, buf
.len
);
936 static int default_edit_option(void)
938 static const char name
[] = "GIT_MERGE_AUTOEDIT";
939 const char *e
= getenv(name
);
940 struct stat st_stdin
, st_stdout
;
943 /* an explicit -m msg without --[no-]edit */
947 int v
= git_parse_maybe_bool(e
);
949 die(_("Bad value '%s' in environment '%s'"), e
, name
);
953 /* Use editor if stdin and stdout are the same and is a tty */
954 return (!fstat(0, &st_stdin
) &&
955 !fstat(1, &st_stdout
) &&
956 isatty(0) && isatty(1) &&
957 st_stdin
.st_dev
== st_stdout
.st_dev
&&
958 st_stdin
.st_ino
== st_stdout
.st_ino
&&
959 st_stdin
.st_mode
== st_stdout
.st_mode
);
962 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
964 struct commit_list
*remoteheads
)
966 struct commit_list
*parents
, **remotes
;
969 * Is the current HEAD reachable from another commit being
970 * merged? If so we do not want to record it as a parent of
971 * the resulting merge, unless --no-ff is given. We will flip
972 * this variable to 0 when we find HEAD among the independent
977 /* Find what parents to record by checking independent ones. */
978 parents
= reduce_heads(remoteheads
);
981 remotes
= &remoteheads
;
983 struct commit
*commit
= pop_commit(&parents
);
984 if (commit
== head_commit
)
987 remotes
= &commit_list_insert(commit
, remotes
)->next
;
992 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
994 struct fmt_merge_msg_opts opts
;
996 memset(&opts
, 0, sizeof(opts
));
997 opts
.add_title
= !have_message
;
998 opts
.shortlog_len
= shortlog_len
;
999 opts
.credit_people
= (0 < option_edit
);
1001 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1003 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1006 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1008 const char *filename
;
1010 struct strbuf fetch_head_file
= STRBUF_INIT
;
1013 merge_names
= &fetch_head_file
;
1015 filename
= git_path_fetch_head();
1016 fd
= open(filename
, O_RDONLY
);
1018 die_errno(_("could not open '%s' for reading"), filename
);
1020 if (strbuf_read(merge_names
, fd
, 0) < 0)
1021 die_errno(_("could not read '%s'"), filename
);
1023 die_errno(_("could not close '%s'"), filename
);
1025 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1026 struct object_id oid
;
1028 struct commit
*commit
;
1030 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1032 npos
= ptr
- merge_names
->buf
+ 1;
1034 npos
= merge_names
->len
;
1036 if (npos
- pos
< GIT_SHA1_HEXSZ
+ 2 ||
1037 get_oid_hex(merge_names
->buf
+ pos
, &oid
))
1038 commit
= NULL
; /* bad */
1039 else if (memcmp(merge_names
->buf
+ pos
+ GIT_SHA1_HEXSZ
, "\t\t", 2))
1040 continue; /* not-for-merge */
1042 char saved
= merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
];
1043 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = '\0';
1044 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1045 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = saved
;
1050 die(_("not something we can merge in %s: %s"),
1051 filename
, merge_names
->buf
+ pos
);
1053 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1056 if (merge_names
== &fetch_head_file
)
1057 strbuf_release(&fetch_head_file
);
1060 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1062 int argc
, const char **argv
,
1063 struct strbuf
*merge_msg
)
1066 struct commit_list
*remoteheads
= NULL
;
1067 struct commit_list
**remotes
= &remoteheads
;
1068 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1070 if (merge_msg
&& (!have_message
|| shortlog_len
))
1071 autogen
= &merge_names
;
1074 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1076 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1077 handle_fetch_head(remotes
, autogen
);
1078 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1080 for (i
= 0; i
< argc
; i
++) {
1081 struct commit
*commit
= get_merge_parent(argv
[i
]);
1083 help_unknown_ref(argv
[i
], "merge",
1084 _("not something we can merge"));
1085 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1087 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1089 struct commit_list
*p
;
1090 for (p
= remoteheads
; p
; p
= p
->next
)
1091 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1096 prepare_merge_message(autogen
, merge_msg
);
1097 strbuf_release(autogen
);
1103 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1105 struct object_id result_tree
, stash
, head_oid
;
1106 struct commit
*head_commit
;
1107 struct strbuf buf
= STRBUF_INIT
;
1108 int i
, ret
= 0, head_subsumed
;
1109 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1110 struct commit_list
*common
= NULL
;
1111 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1112 struct commit_list
*remoteheads
, *p
;
1113 void *branch_to_free
;
1114 int orig_argc
= argc
;
1116 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1117 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1120 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1123 branch
= branch_to_free
= resolve_refdup("HEAD", 0, head_oid
.hash
, NULL
);
1125 skip_prefix(branch
, "refs/heads/", &branch
);
1126 if (!branch
|| is_null_oid(&head_oid
))
1129 head_commit
= lookup_commit_or_die(&head_oid
, "HEAD");
1131 init_diff_ui_defaults();
1132 git_config(git_merge_config
, NULL
);
1134 if (branch_mergeoptions
)
1135 parse_branch_merge_options(branch_mergeoptions
);
1136 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1137 builtin_merge_usage
, 0);
1138 if (shortlog_len
< 0)
1139 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1141 if (verbosity
< 0 && show_progress
== -1)
1144 if (abort_current_merge
) {
1146 const char *nargv
[] = {"reset", "--merge", NULL
};
1149 usage_msg_opt(_("--abort expects no arguments"),
1150 builtin_merge_usage
, builtin_merge_options
);
1152 if (!file_exists(git_path_merge_head()))
1153 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1155 /* Invoke 'git reset --merge' */
1156 ret
= cmd_reset(nargc
, nargv
, prefix
);
1160 if (continue_current_merge
) {
1162 const char *nargv
[] = {"commit", NULL
};
1165 usage_msg_opt(_("--continue expects no arguments"),
1166 builtin_merge_usage
, builtin_merge_options
);
1168 if (!file_exists(git_path_merge_head()))
1169 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1171 /* Invoke 'git commit' */
1172 ret
= cmd_commit(nargc
, nargv
, prefix
);
1176 if (read_cache_unmerged())
1177 die_resolve_conflict("merge");
1179 if (file_exists(git_path_merge_head())) {
1181 * There is no unmerged entry, don't advise 'git
1182 * add/rm <file>', just 'git commit'.
1184 if (advice_resolve_conflict
)
1185 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1186 "Please, commit your changes before you merge."));
1188 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1190 if (file_exists(git_path_cherry_pick_head())) {
1191 if (advice_resolve_conflict
)
1192 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1193 "Please, commit your changes before you merge."));
1195 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1197 resolve_undo_clear();
1203 if (fast_forward
== FF_NO
)
1204 die(_("You cannot combine --squash with --no-ff."));
1209 if (default_to_upstream
)
1210 argc
= setup_with_upstream(&argv
);
1212 die(_("No commit specified and merge.defaultToUpstream not set."));
1213 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1218 usage_with_options(builtin_merge_usage
,
1219 builtin_merge_options
);
1223 * If the merged head is a valid one there is no reason
1224 * to forbid "git merge" into a branch yet to be born.
1225 * We do the same for "git pull".
1227 struct object_id
*remote_head_oid
;
1229 die(_("Squash commit into empty head not supported yet"));
1230 if (fast_forward
== FF_NO
)
1231 die(_("Non-fast-forward commit does not make sense into "
1233 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1236 die(_("%s - not something we can merge"), argv
[0]);
1237 if (remoteheads
->next
)
1238 die(_("Can merge only exactly one commit into empty head"));
1239 remote_head_oid
= &remoteheads
->item
->object
.oid
;
1240 read_empty(remote_head_oid
->hash
, 0);
1241 update_ref("initial pull", "HEAD", remote_head_oid
->hash
,
1242 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1247 * All the rest are the commits being merged; prepare
1248 * the standard merge summary message to be appended
1249 * to the given message.
1251 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1252 argc
, argv
, &merge_msg
);
1254 if (!head_commit
|| !argc
)
1255 usage_with_options(builtin_merge_usage
,
1256 builtin_merge_options
);
1258 if (verify_signatures
) {
1259 for (p
= remoteheads
; p
; p
= p
->next
) {
1260 struct commit
*commit
= p
->item
;
1261 char hex
[GIT_MAX_HEXSZ
+ 1];
1262 struct signature_check signature_check
;
1263 memset(&signature_check
, 0, sizeof(signature_check
));
1265 check_commit_signature(commit
, &signature_check
);
1267 find_unique_abbrev_r(hex
, commit
->object
.oid
.hash
, DEFAULT_ABBREV
);
1268 switch (signature_check
.result
) {
1272 die(_("Commit %s has an untrusted GPG signature, "
1273 "allegedly by %s."), hex
, signature_check
.signer
);
1275 die(_("Commit %s has a bad GPG signature "
1276 "allegedly by %s."), hex
, signature_check
.signer
);
1278 die(_("Commit %s does not have a GPG signature."), hex
);
1280 if (verbosity
>= 0 && signature_check
.result
== 'G')
1281 printf(_("Commit %s has a good GPG signature by %s\n"),
1282 hex
, signature_check
.signer
);
1284 signature_check_clear(&signature_check
);
1288 strbuf_addstr(&buf
, "merge");
1289 for (p
= remoteheads
; p
; p
= p
->next
)
1290 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1291 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1294 for (p
= remoteheads
; p
; p
= p
->next
) {
1295 struct commit
*commit
= p
->item
;
1296 strbuf_addf(&buf
, "GITHEAD_%s",
1297 oid_to_hex(&commit
->object
.oid
));
1298 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1300 if (fast_forward
!= FF_ONLY
&&
1301 merge_remote_util(commit
) &&
1302 merge_remote_util(commit
)->obj
&&
1303 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1304 fast_forward
= FF_NO
;
1307 if (option_edit
< 0)
1308 option_edit
= default_edit_option();
1310 if (!use_strategies
) {
1312 ; /* already up-to-date */
1313 else if (!remoteheads
->next
)
1314 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1316 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1319 for (i
= 0; i
< use_strategies_nr
; i
++) {
1320 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1321 fast_forward
= FF_NO
;
1322 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1327 ; /* already up-to-date */
1328 else if (!remoteheads
->next
)
1329 common
= get_merge_bases(head_commit
, remoteheads
->item
);
1331 struct commit_list
*list
= remoteheads
;
1332 commit_list_insert(head_commit
, &list
);
1333 common
= get_octopus_merge_bases(list
);
1337 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.oid
.hash
,
1338 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1340 if (remoteheads
&& !common
) {
1341 /* No common ancestors found. */
1342 if (!allow_unrelated_histories
)
1343 die(_("refusing to merge unrelated histories"));
1344 /* otherwise, we need a real merge. */
1345 } else if (!remoteheads
||
1346 (!remoteheads
->next
&& !common
->next
&&
1347 common
->item
== remoteheads
->item
)) {
1349 * If head can reach all the merge then we are up to date.
1350 * but first the most common case of merging one remote.
1352 finish_up_to_date(_("Already up-to-date."));
1354 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1356 !oidcmp(&common
->item
->object
.oid
, &head_commit
->object
.oid
)) {
1357 /* Again the most common case of merging one remote. */
1358 struct strbuf msg
= STRBUF_INIT
;
1359 struct commit
*commit
;
1361 if (verbosity
>= 0) {
1362 printf(_("Updating %s..%s\n"),
1363 find_unique_abbrev(head_commit
->object
.oid
.hash
,
1365 find_unique_abbrev(remoteheads
->item
->object
.oid
.hash
,
1368 strbuf_addstr(&msg
, "Fast-forward");
1371 " (no commit created; -m option ignored)");
1372 commit
= remoteheads
->item
;
1378 if (checkout_fast_forward(&head_commit
->object
.oid
,
1379 &commit
->object
.oid
,
1380 overwrite_ignore
)) {
1385 finish(head_commit
, remoteheads
, &commit
->object
.oid
, msg
.buf
);
1388 } else if (!remoteheads
->next
&& common
->next
)
1391 * We are not doing octopus and not fast-forward. Need
1394 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1396 * We are not doing octopus, not fast-forward, and have
1399 refresh_cache(REFRESH_QUIET
);
1400 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1401 /* See if it is really trivial. */
1402 git_committer_info(IDENT_STRICT
);
1403 printf(_("Trying really trivial in-index merge...\n"));
1404 if (!read_tree_trivial(&common
->item
->object
.oid
,
1405 &head_commit
->object
.oid
,
1406 &remoteheads
->item
->object
.oid
)) {
1407 ret
= merge_trivial(head_commit
, remoteheads
);
1410 printf(_("Nope.\n"));
1414 * An octopus. If we can reach all the remote we are up
1418 struct commit_list
*j
;
1420 for (j
= remoteheads
; j
; j
= j
->next
) {
1421 struct commit_list
*common_one
;
1424 * Here we *have* to calculate the individual
1425 * merge_bases again, otherwise "git merge HEAD^
1426 * HEAD^^" would be missed.
1428 common_one
= get_merge_bases(head_commit
, j
->item
);
1429 if (oidcmp(&common_one
->item
->object
.oid
, &j
->item
->object
.oid
)) {
1435 finish_up_to_date(_("Already up-to-date. Yeeah!"));
1440 if (fast_forward
== FF_ONLY
)
1441 die(_("Not possible to fast-forward, aborting."));
1443 /* We are going to make a new commit. */
1444 git_committer_info(IDENT_STRICT
);
1447 * At this point, we need a real merge. No matter what strategy
1448 * we use, it would operate on the index, possibly affecting the
1449 * working tree, and when resolved cleanly, have the desired
1450 * tree in the index -- this means that the index must be in
1451 * sync with the head commit. The strategies are responsible
1454 if (use_strategies_nr
== 1 ||
1456 * Stash away the local changes so that we can try more than one.
1461 for (i
= 0; i
< use_strategies_nr
; i
++) {
1464 printf(_("Rewinding the tree to pristine...\n"));
1465 restore_state(&head_commit
->object
.oid
, &stash
);
1467 if (use_strategies_nr
!= 1)
1468 printf(_("Trying merge strategy %s...\n"),
1469 use_strategies
[i
]->name
);
1471 * Remember which strategy left the state in the working
1474 wt_strategy
= use_strategies
[i
]->name
;
1476 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1477 common
, remoteheads
,
1479 if (!option_commit
&& !ret
) {
1482 * This is necessary here just to avoid writing
1483 * the tree, but later we will *not* exit with
1484 * status code 1 because merge_was_ok is set.
1491 * The backend exits with 1 when conflicts are
1492 * left to be resolved, with 2 when it does not
1493 * handle the given merge at all.
1496 int cnt
= evaluate_result();
1498 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1499 best_strategy
= use_strategies
[i
]->name
;
1509 /* Automerge succeeded. */
1510 write_tree_trivial(&result_tree
);
1511 automerge_was_ok
= 1;
1516 * If we have a resulting tree, that means the strategy module
1517 * auto resolved the merge cleanly.
1519 if (automerge_was_ok
) {
1520 ret
= finish_automerge(head_commit
, head_subsumed
,
1521 common
, remoteheads
,
1522 &result_tree
, wt_strategy
);
1527 * Pick the result from the best strategy and have the user fix
1530 if (!best_strategy
) {
1531 restore_state(&head_commit
->object
.oid
, &stash
);
1532 if (use_strategies_nr
> 1)
1534 _("No merge strategy handled the merge.\n"));
1536 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1537 use_strategies
[0]->name
);
1540 } else if (best_strategy
== wt_strategy
)
1541 ; /* We already have its result in the working tree. */
1543 printf(_("Rewinding the tree to pristine...\n"));
1544 restore_state(&head_commit
->object
.oid
, &stash
);
1545 printf(_("Using the %s to prepare resolving by hand.\n"),
1547 try_merge_strategy(best_strategy
, common
, remoteheads
,
1552 finish(head_commit
, remoteheads
, NULL
, NULL
);
1554 write_merge_state(remoteheads
);
1557 fprintf(stderr
, _("Automatic merge went well; "
1558 "stopped before committing as requested\n"));
1560 ret
= suggest_conflicts();
1563 free(branch_to_free
);