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
;
76 static int verify_msg
= 1;
78 static struct strategy all_strategy
[] = {
79 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
80 { "octopus", DEFAULT_OCTOPUS
},
82 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
83 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
86 static const char *pull_twohead
, *pull_octopus
;
94 static enum ff_type fast_forward
= FF_ALLOW
;
96 static int option_parse_message(const struct option
*opt
,
97 const char *arg
, int unset
)
99 struct strbuf
*buf
= opt
->value
;
102 strbuf_setlen(buf
, 0);
104 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
107 return error(_("switch `m' requires a value"));
111 static struct strategy
*get_strategy(const char *name
)
114 struct strategy
*ret
;
115 static struct cmdnames main_cmds
, other_cmds
;
121 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
122 if (!strcmp(name
, all_strategy
[i
].name
))
123 return &all_strategy
[i
];
126 struct cmdnames not_strategies
;
129 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
130 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
131 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
133 struct cmdname
*ent
= main_cmds
.names
[i
];
134 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
135 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
136 && !all_strategy
[j
].name
[ent
->len
])
139 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
141 exclude_cmds(&main_cmds
, ¬_strategies
);
143 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
144 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
145 fprintf(stderr
, _("Available strategies are:"));
146 for (i
= 0; i
< main_cmds
.cnt
; i
++)
147 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
148 fprintf(stderr
, ".\n");
149 if (other_cmds
.cnt
) {
150 fprintf(stderr
, _("Available custom strategies are:"));
151 for (i
= 0; i
< other_cmds
.cnt
; i
++)
152 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
153 fprintf(stderr
, ".\n");
158 ret
= xcalloc(1, sizeof(struct strategy
));
159 ret
->name
= xstrdup(name
);
160 ret
->attr
= NO_TRIVIAL
;
164 static void append_strategy(struct strategy
*s
)
166 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
167 use_strategies
[use_strategies_nr
++] = s
;
170 static int option_parse_strategy(const struct option
*opt
,
171 const char *name
, int unset
)
176 append_strategy(get_strategy(name
));
180 static int option_parse_x(const struct option
*opt
,
181 const char *arg
, int unset
)
186 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
187 xopts
[xopts_nr
++] = xstrdup(arg
);
191 static int option_parse_n(const struct option
*opt
,
192 const char *arg
, int unset
)
194 show_diffstat
= unset
;
198 static struct option builtin_merge_options
[] = {
199 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
200 N_("do not show a diffstat at the end of the merge"),
201 PARSE_OPT_NOARG
, option_parse_n
},
202 OPT_BOOL(0, "stat", &show_diffstat
,
203 N_("show a diffstat at the end of the merge")),
204 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
205 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
206 N_("add (at most <n>) entries from shortlog to merge commit message"),
207 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
208 OPT_BOOL(0, "squash", &squash
,
209 N_("create a single commit instead of doing a merge")),
210 OPT_BOOL(0, "commit", &option_commit
,
211 N_("perform a commit if the merge succeeds (default)")),
212 OPT_BOOL('e', "edit", &option_edit
,
213 N_("edit message before committing")),
214 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
215 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
216 N_("abort if fast-forward is not possible"),
217 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
218 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
219 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
220 N_("verify that the named commit has a valid GPG signature")),
221 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
222 N_("merge strategy to use"), option_parse_strategy
),
223 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
224 N_("option for selected merge strategy"), option_parse_x
),
225 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
226 N_("merge commit message (for a non-fast-forward merge)"),
227 option_parse_message
),
228 OPT__VERBOSITY(&verbosity
),
229 OPT_BOOL(0, "abort", &abort_current_merge
,
230 N_("abort the current in-progress merge")),
231 OPT_BOOL(0, "continue", &continue_current_merge
,
232 N_("continue the current in-progress merge")),
233 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories
,
234 N_("allow merging unrelated histories")),
235 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
236 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
237 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
238 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
239 OPT_BOOL(0, "signoff", &signoff
, N_("add Signed-off-by:")),
240 OPT_BOOL(0, "verify", &verify_msg
, N_("verify commit-msg hook")),
244 /* Cleans up metadata that is uninteresting after a succeeded merge. */
245 static void drop_save(void)
247 unlink(git_path_merge_head());
248 unlink(git_path_merge_msg());
249 unlink(git_path_merge_mode());
252 static int save_state(struct object_id
*stash
)
255 struct child_process cp
= CHILD_PROCESS_INIT
;
256 struct strbuf buffer
= STRBUF_INIT
;
257 const char *argv
[] = {"stash", "create", NULL
};
263 if (start_command(&cp
))
264 die(_("could not run stash."));
265 len
= strbuf_read(&buffer
, cp
.out
, 1024);
268 if (finish_command(&cp
) || len
< 0)
269 die(_("stash failed"));
270 else if (!len
) /* no changes */
272 strbuf_setlen(&buffer
, buffer
.len
-1);
273 if (get_oid(buffer
.buf
, stash
))
274 die(_("not a valid object: %s"), buffer
.buf
);
278 static void read_empty(unsigned const char *sha1
, int verbose
)
283 args
[i
++] = "read-tree";
288 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
289 args
[i
++] = sha1_to_hex(sha1
);
292 if (run_command_v_opt(args
, RUN_GIT_CMD
))
293 die(_("read-tree failed"));
296 static void reset_hard(unsigned const char *sha1
, int verbose
)
301 args
[i
++] = "read-tree";
304 args
[i
++] = "--reset";
306 args
[i
++] = sha1_to_hex(sha1
);
309 if (run_command_v_opt(args
, RUN_GIT_CMD
))
310 die(_("read-tree failed"));
313 static void restore_state(const struct object_id
*head
,
314 const struct object_id
*stash
)
316 struct strbuf sb
= STRBUF_INIT
;
317 const char *args
[] = { "stash", "apply", NULL
, NULL
};
319 if (is_null_oid(stash
))
322 reset_hard(head
->hash
, 1);
324 args
[2] = oid_to_hex(stash
);
327 * It is OK to ignore error here, for example when there was
328 * nothing to restore.
330 run_command_v_opt(args
, RUN_GIT_CMD
);
333 refresh_cache(REFRESH_QUIET
);
336 /* This is called when no merge was necessary. */
337 static void finish_up_to_date(const char *msg
)
340 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
344 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
347 struct strbuf out
= STRBUF_INIT
;
348 struct commit_list
*j
;
349 struct pretty_print_context ctx
= {0};
351 printf(_("Squash commit -- not updating HEAD\n"));
353 init_revisions(&rev
, NULL
);
354 rev
.ignore_merges
= 1;
355 rev
.commit_format
= CMIT_FMT_MEDIUM
;
357 commit
->object
.flags
|= UNINTERESTING
;
358 add_pending_object(&rev
, &commit
->object
, NULL
);
360 for (j
= remoteheads
; j
; j
= j
->next
)
361 add_pending_object(&rev
, &j
->item
->object
, NULL
);
363 setup_revisions(0, NULL
, &rev
, NULL
);
364 if (prepare_revision_walk(&rev
))
365 die(_("revision walk setup failed"));
367 ctx
.abbrev
= rev
.abbrev
;
368 ctx
.date_mode
= rev
.date_mode
;
369 ctx
.fmt
= rev
.commit_format
;
371 strbuf_addstr(&out
, "Squashed commit of the following:\n");
372 while ((commit
= get_revision(&rev
)) != NULL
) {
373 strbuf_addch(&out
, '\n');
374 strbuf_addf(&out
, "commit %s\n",
375 oid_to_hex(&commit
->object
.oid
));
376 pretty_print_commit(&ctx
, commit
, &out
);
378 write_file_buf(git_path_squash_msg(), out
.buf
, out
.len
);
379 strbuf_release(&out
);
382 static void finish(struct commit
*head_commit
,
383 struct commit_list
*remoteheads
,
384 const struct object_id
*new_head
, const char *msg
)
386 struct strbuf reflog_message
= STRBUF_INIT
;
387 const struct object_id
*head
= &head_commit
->object
.oid
;
390 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
394 strbuf_addf(&reflog_message
, "%s: %s",
395 getenv("GIT_REFLOG_ACTION"), msg
);
398 squash_message(head_commit
, remoteheads
);
400 if (verbosity
>= 0 && !merge_msg
.len
)
401 printf(_("No merge message -- not updating HEAD\n"));
403 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
404 update_ref(reflog_message
.buf
, "HEAD",
405 new_head
->hash
, head
->hash
, 0,
406 UPDATE_REFS_DIE_ON_ERR
);
408 * We ignore errors in 'gc --auto', since the
409 * user should see them.
412 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
415 if (new_head
&& show_diffstat
) {
416 struct diff_options opts
;
418 opts
.stat_width
= -1; /* use full terminal width */
419 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
420 opts
.output_format
|=
421 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
422 opts
.detect_rename
= DIFF_DETECT_RENAME
;
423 diff_setup_done(&opts
);
424 diff_tree_oid(head
, new_head
, "", &opts
);
429 /* Run a post-merge hook */
430 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
432 strbuf_release(&reflog_message
);
435 /* Get the name for the merge commit's message. */
436 static void merge_name(const char *remote
, struct strbuf
*msg
)
438 struct commit
*remote_head
;
439 struct object_id branch_head
;
440 struct strbuf buf
= STRBUF_INIT
;
441 struct strbuf bname
= STRBUF_INIT
;
446 strbuf_branchname(&bname
, remote
, 0);
449 oidclr(&branch_head
);
450 remote_head
= get_merge_parent(remote
);
452 die(_("'%s' does not point to a commit"), remote
);
454 if (dwim_ref(remote
, strlen(remote
), branch_head
.hash
, &found_ref
) > 0) {
455 if (starts_with(found_ref
, "refs/heads/")) {
456 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
457 oid_to_hex(&branch_head
), remote
);
460 if (starts_with(found_ref
, "refs/tags/")) {
461 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
462 oid_to_hex(&branch_head
), remote
);
465 if (starts_with(found_ref
, "refs/remotes/")) {
466 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
467 oid_to_hex(&branch_head
), remote
);
472 /* See if remote matches <name>^^^.. or <name>~<number> */
473 for (len
= 0, ptr
= remote
+ strlen(remote
);
474 remote
< ptr
&& ptr
[-1] == '^';
481 ptr
= strrchr(remote
, '~');
483 int seen_nonzero
= 0;
486 while (*++ptr
&& isdigit(*ptr
)) {
487 seen_nonzero
|= (*ptr
!= '0');
491 len
= 0; /* not ...~<number> */
492 else if (seen_nonzero
)
495 early
= 1; /* "name~" is "name~1"! */
499 struct strbuf truname
= STRBUF_INIT
;
500 strbuf_addf(&truname
, "refs/heads/%s", remote
);
501 strbuf_setlen(&truname
, truname
.len
- len
);
502 if (ref_exists(truname
.buf
)) {
504 "%s\t\tbranch '%s'%s of .\n",
505 oid_to_hex(&remote_head
->object
.oid
),
507 (early
? " (early part)" : ""));
508 strbuf_release(&truname
);
511 strbuf_release(&truname
);
514 if (remote_head
->util
) {
515 struct merge_remote_desc
*desc
;
516 desc
= merge_remote_util(remote_head
);
517 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
518 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
519 oid_to_hex(&desc
->obj
->oid
),
520 typename(desc
->obj
->type
),
526 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
527 oid_to_hex(&remote_head
->object
.oid
), remote
);
529 strbuf_release(&buf
);
530 strbuf_release(&bname
);
533 static void parse_branch_merge_options(char *bmo
)
540 argc
= split_cmdline(bmo
, &argv
);
542 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
543 split_cmdline_strerror(argc
));
544 REALLOC_ARRAY(argv
, argc
+ 2);
545 MOVE_ARRAY(argv
+ 1, argv
, argc
+ 1);
547 argv
[0] = "branch.*.mergeoptions";
548 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
549 builtin_merge_usage
, 0);
553 static int git_merge_config(const char *k
, const char *v
, void *cb
)
557 if (branch
&& starts_with(k
, "branch.") &&
558 starts_with(k
+ 7, branch
) &&
559 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
560 free(branch_mergeoptions
);
561 branch_mergeoptions
= xstrdup(v
);
565 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
566 show_diffstat
= git_config_bool(k
, v
);
567 else if (!strcmp(k
, "pull.twohead"))
568 return git_config_string(&pull_twohead
, k
, v
);
569 else if (!strcmp(k
, "pull.octopus"))
570 return git_config_string(&pull_octopus
, k
, v
);
571 else if (!strcmp(k
, "merge.renormalize"))
572 option_renormalize
= git_config_bool(k
, v
);
573 else if (!strcmp(k
, "merge.ff")) {
574 int boolval
= git_parse_maybe_bool(v
);
576 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
577 } else if (v
&& !strcmp(v
, "only")) {
578 fast_forward
= FF_ONLY
;
579 } /* do not barf on values from future versions of git */
581 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
582 default_to_upstream
= git_config_bool(k
, v
);
584 } else if (!strcmp(k
, "commit.gpgsign")) {
585 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
589 status
= fmt_merge_msg_config(k
, v
, cb
);
592 status
= git_gpg_config(k
, v
, NULL
);
595 return git_diff_ui_config(k
, v
, cb
);
598 static int read_tree_trivial(struct object_id
*common
, struct object_id
*head
,
599 struct object_id
*one
)
602 struct tree
*trees
[MAX_UNPACK_TREES
];
603 struct tree_desc t
[MAX_UNPACK_TREES
];
604 struct unpack_trees_options opts
;
606 memset(&opts
, 0, sizeof(opts
));
608 opts
.src_index
= &the_index
;
609 opts
.dst_index
= &the_index
;
611 opts
.verbose_update
= 1;
612 opts
.trivial_merges_only
= 1;
614 trees
[nr_trees
] = parse_tree_indirect(common
);
615 if (!trees
[nr_trees
++])
617 trees
[nr_trees
] = parse_tree_indirect(head
);
618 if (!trees
[nr_trees
++])
620 trees
[nr_trees
] = parse_tree_indirect(one
);
621 if (!trees
[nr_trees
++])
623 opts
.fn
= threeway_merge
;
624 cache_tree_free(&active_cache_tree
);
625 for (i
= 0; i
< nr_trees
; i
++) {
626 parse_tree(trees
[i
]);
627 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
629 if (unpack_trees(nr_trees
, t
, &opts
))
634 static void write_tree_trivial(struct object_id
*oid
)
636 if (write_cache_as_tree(oid
->hash
, 0, NULL
))
637 die(_("git write-tree failed to write a tree"));
640 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
641 struct commit_list
*remoteheads
,
644 static struct lock_file lock
;
645 const char *head_arg
= "HEAD";
647 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
648 refresh_cache(REFRESH_QUIET
);
649 if (active_cache_changed
&&
650 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
651 return error(_("Unable to write index."));
652 rollback_lock_file(&lock
);
654 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
656 struct commit
*result
;
657 struct commit_list
*reversed
= NULL
;
658 struct merge_options o
;
659 struct commit_list
*j
;
661 if (remoteheads
->next
) {
662 error(_("Not handling anything other than two heads merge."));
666 init_merge_options(&o
);
667 if (!strcmp(strategy
, "subtree"))
668 o
.subtree_shift
= "";
670 o
.renormalize
= option_renormalize
;
671 o
.show_rename_progress
=
672 show_progress
== -1 ? isatty(2) : show_progress
;
674 for (x
= 0; x
< xopts_nr
; x
++)
675 if (parse_merge_opt(&o
, xopts
[x
]))
676 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
678 o
.branch1
= head_arg
;
679 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
681 for (j
= common
; j
; j
= j
->next
)
682 commit_list_insert(j
->item
, &reversed
);
684 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
685 clean
= merge_recursive(&o
, head
,
686 remoteheads
->item
, reversed
, &result
);
689 if (active_cache_changed
&&
690 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
691 die (_("unable to write %s"), get_index_file());
692 rollback_lock_file(&lock
);
693 return clean
? 0 : 1;
695 return try_merge_command(strategy
, xopts_nr
, xopts
,
696 common
, head_arg
, remoteheads
);
700 static void count_diff_files(struct diff_queue_struct
*q
,
701 struct diff_options
*opt
, void *data
)
708 static int count_unmerged_entries(void)
712 for (i
= 0; i
< active_nr
; i
++)
713 if (ce_stage(active_cache
[i
]))
719 static void add_strategies(const char *string
, unsigned attr
)
724 struct string_list list
= STRING_LIST_INIT_DUP
;
725 struct string_list_item
*item
;
726 string_list_split(&list
, string
, ' ', -1);
727 for_each_string_list_item(item
, &list
)
728 append_strategy(get_strategy(item
->string
));
729 string_list_clear(&list
, 0);
732 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
733 if (all_strategy
[i
].attr
& attr
)
734 append_strategy(&all_strategy
[i
]);
738 static void read_merge_msg(struct strbuf
*msg
)
740 const char *filename
= git_path_merge_msg();
742 if (strbuf_read_file(msg
, filename
, 0) < 0)
743 die_errno(_("Could not read from '%s'"), filename
);
746 static void write_merge_state(struct commit_list
*);
747 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
750 error("%s", err_msg
);
752 _("Not committing merge; use 'git commit' to complete the merge.\n"));
753 write_merge_state(remoteheads
);
757 static const char merge_editor_comment
[] =
758 N_("Please enter a commit message to explain why this merge is necessary,\n"
759 "especially if it merges an updated upstream into a topic branch.\n"
761 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
764 static void write_merge_heads(struct commit_list
*);
765 static void prepare_to_commit(struct commit_list
*remoteheads
)
767 struct strbuf msg
= STRBUF_INIT
;
768 strbuf_addbuf(&msg
, &merge_msg
);
769 strbuf_addch(&msg
, '\n');
771 BUG("the control must not reach here under --squash");
773 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
775 append_signoff(&msg
, ignore_non_trailer(msg
.buf
, msg
.len
), 0);
776 write_merge_heads(remoteheads
);
777 write_file_buf(git_path_merge_msg(), msg
.buf
, msg
.len
);
778 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
779 git_path_merge_msg(), "merge", NULL
))
780 abort_commit(remoteheads
, NULL
);
781 if (0 < option_edit
) {
782 if (launch_editor(git_path_merge_msg(), NULL
, NULL
))
783 abort_commit(remoteheads
, NULL
);
786 if (verify_msg
&& run_commit_hook(0 < option_edit
, get_index_file(),
788 git_path_merge_msg(), NULL
))
789 abort_commit(remoteheads
, NULL
);
791 read_merge_msg(&msg
);
792 strbuf_stripspace(&msg
, 0 < option_edit
);
794 abort_commit(remoteheads
, _("Empty commit message."));
795 strbuf_release(&merge_msg
);
796 strbuf_addbuf(&merge_msg
, &msg
);
797 strbuf_release(&msg
);
800 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
802 struct object_id result_tree
, result_commit
;
803 struct commit_list
*parents
, **pptr
= &parents
;
804 static struct lock_file lock
;
806 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
807 refresh_cache(REFRESH_QUIET
);
808 if (active_cache_changed
&&
809 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
810 return error(_("Unable to write index."));
811 rollback_lock_file(&lock
);
813 write_tree_trivial(&result_tree
);
814 printf(_("Wonderful.\n"));
815 pptr
= commit_list_append(head
, pptr
);
816 pptr
= commit_list_append(remoteheads
->item
, pptr
);
817 prepare_to_commit(remoteheads
);
818 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
.hash
, parents
,
819 result_commit
.hash
, NULL
, sign_commit
))
820 die(_("failed to write commit object"));
821 finish(head
, remoteheads
, &result_commit
, "In-index merge");
826 static int finish_automerge(struct commit
*head
,
828 struct commit_list
*common
,
829 struct commit_list
*remoteheads
,
830 struct object_id
*result_tree
,
831 const char *wt_strategy
)
833 struct commit_list
*parents
= NULL
;
834 struct strbuf buf
= STRBUF_INIT
;
835 struct object_id result_commit
;
837 free_commit_list(common
);
838 parents
= remoteheads
;
839 if (!head_subsumed
|| fast_forward
== FF_NO
)
840 commit_list_insert(head
, &parents
);
841 strbuf_addch(&merge_msg
, '\n');
842 prepare_to_commit(remoteheads
);
843 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
->hash
, parents
,
844 result_commit
.hash
, NULL
, sign_commit
))
845 die(_("failed to write commit object"));
846 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
847 finish(head
, remoteheads
, &result_commit
, buf
.buf
);
848 strbuf_release(&buf
);
853 static int suggest_conflicts(void)
855 const char *filename
;
857 struct strbuf msgbuf
= STRBUF_INIT
;
859 filename
= git_path_merge_msg();
860 fp
= xfopen(filename
, "a");
862 append_conflicts_hint(&msgbuf
);
863 fputs(msgbuf
.buf
, fp
);
864 strbuf_release(&msgbuf
);
866 rerere(allow_rerere_auto
);
867 printf(_("Automatic merge failed; "
868 "fix conflicts and then commit the result.\n"));
872 static int evaluate_result(void)
877 /* Check how many files differ. */
878 init_revisions(&rev
, "");
879 setup_revisions(0, NULL
, &rev
, NULL
);
880 rev
.diffopt
.output_format
|=
881 DIFF_FORMAT_CALLBACK
;
882 rev
.diffopt
.format_callback
= count_diff_files
;
883 rev
.diffopt
.format_callback_data
= &cnt
;
884 run_diff_files(&rev
, 0);
887 * Check how many unmerged entries are
890 cnt
+= count_unmerged_entries();
896 * Pretend as if the user told us to merge with the remote-tracking
897 * branch we have for the upstream of the current branch
899 static int setup_with_upstream(const char ***argv
)
901 struct branch
*branch
= branch_get(NULL
);
906 die(_("No current branch."));
907 if (!branch
->remote_name
)
908 die(_("No remote for the current branch."));
909 if (!branch
->merge_nr
)
910 die(_("No default upstream defined for the current branch."));
912 args
= xcalloc(st_add(branch
->merge_nr
, 1), sizeof(char *));
913 for (i
= 0; i
< branch
->merge_nr
; i
++) {
914 if (!branch
->merge
[i
]->dst
)
915 die(_("No remote-tracking branch for %s from %s"),
916 branch
->merge
[i
]->src
, branch
->remote_name
);
917 args
[i
] = branch
->merge
[i
]->dst
;
924 static void write_merge_heads(struct commit_list
*remoteheads
)
926 struct commit_list
*j
;
927 struct strbuf buf
= STRBUF_INIT
;
929 for (j
= remoteheads
; j
; j
= j
->next
) {
930 struct object_id
*oid
;
931 struct commit
*c
= j
->item
;
932 if (c
->util
&& merge_remote_util(c
)->obj
) {
933 oid
= &merge_remote_util(c
)->obj
->oid
;
935 oid
= &c
->object
.oid
;
937 strbuf_addf(&buf
, "%s\n", oid_to_hex(oid
));
939 write_file_buf(git_path_merge_head(), buf
.buf
, buf
.len
);
942 if (fast_forward
== FF_NO
)
943 strbuf_addstr(&buf
, "no-ff");
944 write_file_buf(git_path_merge_mode(), buf
.buf
, buf
.len
);
947 static void write_merge_state(struct commit_list
*remoteheads
)
949 write_merge_heads(remoteheads
);
950 strbuf_addch(&merge_msg
, '\n');
951 write_file_buf(git_path_merge_msg(), merge_msg
.buf
, merge_msg
.len
);
954 static int default_edit_option(void)
956 static const char name
[] = "GIT_MERGE_AUTOEDIT";
957 const char *e
= getenv(name
);
958 struct stat st_stdin
, st_stdout
;
961 /* an explicit -m msg without --[no-]edit */
965 int v
= git_parse_maybe_bool(e
);
967 die(_("Bad value '%s' in environment '%s'"), e
, name
);
971 /* Use editor if stdin and stdout are the same and is a tty */
972 return (!fstat(0, &st_stdin
) &&
973 !fstat(1, &st_stdout
) &&
974 isatty(0) && isatty(1) &&
975 st_stdin
.st_dev
== st_stdout
.st_dev
&&
976 st_stdin
.st_ino
== st_stdout
.st_ino
&&
977 st_stdin
.st_mode
== st_stdout
.st_mode
);
980 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
982 struct commit_list
*remoteheads
)
984 struct commit_list
*parents
, **remotes
;
987 * Is the current HEAD reachable from another commit being
988 * merged? If so we do not want to record it as a parent of
989 * the resulting merge, unless --no-ff is given. We will flip
990 * this variable to 0 when we find HEAD among the independent
995 /* Find what parents to record by checking independent ones. */
996 parents
= reduce_heads(remoteheads
);
999 remotes
= &remoteheads
;
1001 struct commit
*commit
= pop_commit(&parents
);
1002 if (commit
== head_commit
)
1005 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1010 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
1012 struct fmt_merge_msg_opts opts
;
1014 memset(&opts
, 0, sizeof(opts
));
1015 opts
.add_title
= !have_message
;
1016 opts
.shortlog_len
= shortlog_len
;
1017 opts
.credit_people
= (0 < option_edit
);
1019 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1021 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1024 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1026 const char *filename
;
1028 struct strbuf fetch_head_file
= STRBUF_INIT
;
1031 merge_names
= &fetch_head_file
;
1033 filename
= git_path_fetch_head();
1034 fd
= open(filename
, O_RDONLY
);
1036 die_errno(_("could not open '%s' for reading"), filename
);
1038 if (strbuf_read(merge_names
, fd
, 0) < 0)
1039 die_errno(_("could not read '%s'"), filename
);
1041 die_errno(_("could not close '%s'"), filename
);
1043 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1044 struct object_id oid
;
1046 struct commit
*commit
;
1048 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1050 npos
= ptr
- merge_names
->buf
+ 1;
1052 npos
= merge_names
->len
;
1054 if (npos
- pos
< GIT_SHA1_HEXSZ
+ 2 ||
1055 get_oid_hex(merge_names
->buf
+ pos
, &oid
))
1056 commit
= NULL
; /* bad */
1057 else if (memcmp(merge_names
->buf
+ pos
+ GIT_SHA1_HEXSZ
, "\t\t", 2))
1058 continue; /* not-for-merge */
1060 char saved
= merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
];
1061 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = '\0';
1062 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1063 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = saved
;
1068 die(_("not something we can merge in %s: %s"),
1069 filename
, merge_names
->buf
+ pos
);
1071 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1074 if (merge_names
== &fetch_head_file
)
1075 strbuf_release(&fetch_head_file
);
1078 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1080 int argc
, const char **argv
,
1081 struct strbuf
*merge_msg
)
1084 struct commit_list
*remoteheads
= NULL
;
1085 struct commit_list
**remotes
= &remoteheads
;
1086 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1088 if (merge_msg
&& (!have_message
|| shortlog_len
))
1089 autogen
= &merge_names
;
1092 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1094 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1095 handle_fetch_head(remotes
, autogen
);
1096 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1098 for (i
= 0; i
< argc
; i
++) {
1099 struct commit
*commit
= get_merge_parent(argv
[i
]);
1101 help_unknown_ref(argv
[i
], "merge",
1102 _("not something we can merge"));
1103 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1105 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1107 struct commit_list
*p
;
1108 for (p
= remoteheads
; p
; p
= p
->next
)
1109 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1114 prepare_merge_message(autogen
, merge_msg
);
1115 strbuf_release(autogen
);
1121 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1123 struct object_id result_tree
, stash
, head_oid
;
1124 struct commit
*head_commit
;
1125 struct strbuf buf
= STRBUF_INIT
;
1126 int i
, ret
= 0, head_subsumed
;
1127 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1128 struct commit_list
*common
= NULL
;
1129 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1130 struct commit_list
*remoteheads
, *p
;
1131 void *branch_to_free
;
1132 int orig_argc
= argc
;
1134 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1135 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1138 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1141 branch
= branch_to_free
= resolve_refdup("HEAD", 0, head_oid
.hash
, NULL
);
1143 skip_prefix(branch
, "refs/heads/", &branch
);
1144 if (!branch
|| is_null_oid(&head_oid
))
1147 head_commit
= lookup_commit_or_die(&head_oid
, "HEAD");
1149 init_diff_ui_defaults();
1150 git_config(git_merge_config
, NULL
);
1152 if (branch_mergeoptions
)
1153 parse_branch_merge_options(branch_mergeoptions
);
1154 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1155 builtin_merge_usage
, 0);
1156 if (shortlog_len
< 0)
1157 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1159 if (verbosity
< 0 && show_progress
== -1)
1162 if (abort_current_merge
) {
1164 const char *nargv
[] = {"reset", "--merge", NULL
};
1167 usage_msg_opt(_("--abort expects no arguments"),
1168 builtin_merge_usage
, builtin_merge_options
);
1170 if (!file_exists(git_path_merge_head()))
1171 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1173 /* Invoke 'git reset --merge' */
1174 ret
= cmd_reset(nargc
, nargv
, prefix
);
1178 if (continue_current_merge
) {
1180 const char *nargv
[] = {"commit", NULL
};
1183 usage_msg_opt(_("--continue expects no arguments"),
1184 builtin_merge_usage
, builtin_merge_options
);
1186 if (!file_exists(git_path_merge_head()))
1187 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1189 /* Invoke 'git commit' */
1190 ret
= cmd_commit(nargc
, nargv
, prefix
);
1194 if (read_cache_unmerged())
1195 die_resolve_conflict("merge");
1197 if (file_exists(git_path_merge_head())) {
1199 * There is no unmerged entry, don't advise 'git
1200 * add/rm <file>', just 'git commit'.
1202 if (advice_resolve_conflict
)
1203 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1204 "Please, commit your changes before you merge."));
1206 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1208 if (file_exists(git_path_cherry_pick_head())) {
1209 if (advice_resolve_conflict
)
1210 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1211 "Please, commit your changes before you merge."));
1213 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1215 resolve_undo_clear();
1221 if (fast_forward
== FF_NO
)
1222 die(_("You cannot combine --squash with --no-ff."));
1227 if (default_to_upstream
)
1228 argc
= setup_with_upstream(&argv
);
1230 die(_("No commit specified and merge.defaultToUpstream not set."));
1231 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1236 usage_with_options(builtin_merge_usage
,
1237 builtin_merge_options
);
1241 * If the merged head is a valid one there is no reason
1242 * to forbid "git merge" into a branch yet to be born.
1243 * We do the same for "git pull".
1245 struct object_id
*remote_head_oid
;
1247 die(_("Squash commit into empty head not supported yet"));
1248 if (fast_forward
== FF_NO
)
1249 die(_("Non-fast-forward commit does not make sense into "
1251 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1254 die(_("%s - not something we can merge"), argv
[0]);
1255 if (remoteheads
->next
)
1256 die(_("Can merge only exactly one commit into empty head"));
1257 remote_head_oid
= &remoteheads
->item
->object
.oid
;
1258 read_empty(remote_head_oid
->hash
, 0);
1259 update_ref("initial pull", "HEAD", remote_head_oid
->hash
,
1260 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1265 * All the rest are the commits being merged; prepare
1266 * the standard merge summary message to be appended
1267 * to the given message.
1269 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1270 argc
, argv
, &merge_msg
);
1272 if (!head_commit
|| !argc
)
1273 usage_with_options(builtin_merge_usage
,
1274 builtin_merge_options
);
1276 if (verify_signatures
) {
1277 for (p
= remoteheads
; p
; p
= p
->next
) {
1278 struct commit
*commit
= p
->item
;
1279 char hex
[GIT_MAX_HEXSZ
+ 1];
1280 struct signature_check signature_check
;
1281 memset(&signature_check
, 0, sizeof(signature_check
));
1283 check_commit_signature(commit
, &signature_check
);
1285 find_unique_abbrev_r(hex
, commit
->object
.oid
.hash
, DEFAULT_ABBREV
);
1286 switch (signature_check
.result
) {
1290 die(_("Commit %s has an untrusted GPG signature, "
1291 "allegedly by %s."), hex
, signature_check
.signer
);
1293 die(_("Commit %s has a bad GPG signature "
1294 "allegedly by %s."), hex
, signature_check
.signer
);
1296 die(_("Commit %s does not have a GPG signature."), hex
);
1298 if (verbosity
>= 0 && signature_check
.result
== 'G')
1299 printf(_("Commit %s has a good GPG signature by %s\n"),
1300 hex
, signature_check
.signer
);
1302 signature_check_clear(&signature_check
);
1306 strbuf_addstr(&buf
, "merge");
1307 for (p
= remoteheads
; p
; p
= p
->next
)
1308 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1309 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1312 for (p
= remoteheads
; p
; p
= p
->next
) {
1313 struct commit
*commit
= p
->item
;
1314 strbuf_addf(&buf
, "GITHEAD_%s",
1315 oid_to_hex(&commit
->object
.oid
));
1316 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1318 if (fast_forward
!= FF_ONLY
&&
1319 merge_remote_util(commit
) &&
1320 merge_remote_util(commit
)->obj
&&
1321 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1322 fast_forward
= FF_NO
;
1325 if (option_edit
< 0)
1326 option_edit
= default_edit_option();
1328 if (!use_strategies
) {
1330 ; /* already up-to-date */
1331 else if (!remoteheads
->next
)
1332 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1334 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1337 for (i
= 0; i
< use_strategies_nr
; i
++) {
1338 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1339 fast_forward
= FF_NO
;
1340 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1345 ; /* already up-to-date */
1346 else if (!remoteheads
->next
)
1347 common
= get_merge_bases(head_commit
, remoteheads
->item
);
1349 struct commit_list
*list
= remoteheads
;
1350 commit_list_insert(head_commit
, &list
);
1351 common
= get_octopus_merge_bases(list
);
1355 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.oid
.hash
,
1356 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1358 if (remoteheads
&& !common
) {
1359 /* No common ancestors found. */
1360 if (!allow_unrelated_histories
)
1361 die(_("refusing to merge unrelated histories"));
1362 /* otherwise, we need a real merge. */
1363 } else if (!remoteheads
||
1364 (!remoteheads
->next
&& !common
->next
&&
1365 common
->item
== remoteheads
->item
)) {
1367 * If head can reach all the merge then we are up to date.
1368 * but first the most common case of merging one remote.
1370 finish_up_to_date(_("Already up to date."));
1372 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1374 !oidcmp(&common
->item
->object
.oid
, &head_commit
->object
.oid
)) {
1375 /* Again the most common case of merging one remote. */
1376 struct strbuf msg
= STRBUF_INIT
;
1377 struct commit
*commit
;
1379 if (verbosity
>= 0) {
1380 printf(_("Updating %s..%s\n"),
1381 find_unique_abbrev(head_commit
->object
.oid
.hash
,
1383 find_unique_abbrev(remoteheads
->item
->object
.oid
.hash
,
1386 strbuf_addstr(&msg
, "Fast-forward");
1389 " (no commit created; -m option ignored)");
1390 commit
= remoteheads
->item
;
1396 if (checkout_fast_forward(&head_commit
->object
.oid
,
1397 &commit
->object
.oid
,
1398 overwrite_ignore
)) {
1403 finish(head_commit
, remoteheads
, &commit
->object
.oid
, msg
.buf
);
1406 } else if (!remoteheads
->next
&& common
->next
)
1409 * We are not doing octopus and not fast-forward. Need
1412 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1414 * We are not doing octopus, not fast-forward, and have
1417 refresh_cache(REFRESH_QUIET
);
1418 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1419 /* See if it is really trivial. */
1420 git_committer_info(IDENT_STRICT
);
1421 printf(_("Trying really trivial in-index merge...\n"));
1422 if (!read_tree_trivial(&common
->item
->object
.oid
,
1423 &head_commit
->object
.oid
,
1424 &remoteheads
->item
->object
.oid
)) {
1425 ret
= merge_trivial(head_commit
, remoteheads
);
1428 printf(_("Nope.\n"));
1432 * An octopus. If we can reach all the remote we are up
1436 struct commit_list
*j
;
1438 for (j
= remoteheads
; j
; j
= j
->next
) {
1439 struct commit_list
*common_one
;
1442 * Here we *have* to calculate the individual
1443 * merge_bases again, otherwise "git merge HEAD^
1444 * HEAD^^" would be missed.
1446 common_one
= get_merge_bases(head_commit
, j
->item
);
1447 if (oidcmp(&common_one
->item
->object
.oid
, &j
->item
->object
.oid
)) {
1453 finish_up_to_date(_("Already up to date. Yeeah!"));
1458 if (fast_forward
== FF_ONLY
)
1459 die(_("Not possible to fast-forward, aborting."));
1461 /* We are going to make a new commit. */
1462 git_committer_info(IDENT_STRICT
);
1465 * At this point, we need a real merge. No matter what strategy
1466 * we use, it would operate on the index, possibly affecting the
1467 * working tree, and when resolved cleanly, have the desired
1468 * tree in the index -- this means that the index must be in
1469 * sync with the head commit. The strategies are responsible
1472 if (use_strategies_nr
== 1 ||
1474 * Stash away the local changes so that we can try more than one.
1479 for (i
= 0; i
< use_strategies_nr
; i
++) {
1482 printf(_("Rewinding the tree to pristine...\n"));
1483 restore_state(&head_commit
->object
.oid
, &stash
);
1485 if (use_strategies_nr
!= 1)
1486 printf(_("Trying merge strategy %s...\n"),
1487 use_strategies
[i
]->name
);
1489 * Remember which strategy left the state in the working
1492 wt_strategy
= use_strategies
[i
]->name
;
1494 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1495 common
, remoteheads
,
1497 if (!option_commit
&& !ret
) {
1500 * This is necessary here just to avoid writing
1501 * the tree, but later we will *not* exit with
1502 * status code 1 because merge_was_ok is set.
1509 * The backend exits with 1 when conflicts are
1510 * left to be resolved, with 2 when it does not
1511 * handle the given merge at all.
1514 int cnt
= evaluate_result();
1516 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1517 best_strategy
= use_strategies
[i
]->name
;
1527 /* Automerge succeeded. */
1528 write_tree_trivial(&result_tree
);
1529 automerge_was_ok
= 1;
1534 * If we have a resulting tree, that means the strategy module
1535 * auto resolved the merge cleanly.
1537 if (automerge_was_ok
) {
1538 ret
= finish_automerge(head_commit
, head_subsumed
,
1539 common
, remoteheads
,
1540 &result_tree
, wt_strategy
);
1545 * Pick the result from the best strategy and have the user fix
1548 if (!best_strategy
) {
1549 restore_state(&head_commit
->object
.oid
, &stash
);
1550 if (use_strategies_nr
> 1)
1552 _("No merge strategy handled the merge.\n"));
1554 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1555 use_strategies
[0]->name
);
1558 } else if (best_strategy
== wt_strategy
)
1559 ; /* We already have its result in the working tree. */
1561 printf(_("Rewinding the tree to pristine...\n"));
1562 restore_state(&head_commit
->object
.oid
, &stash
);
1563 printf(_("Using the %s to prepare resolving by hand.\n"),
1565 try_merge_strategy(best_strategy
, common
, remoteheads
,
1570 finish(head_commit
, remoteheads
, NULL
, NULL
);
1572 write_merge_state(remoteheads
);
1575 fprintf(stderr
, _("Automatic merge went well; "
1576 "stopped before committing as requested\n"));
1578 ret
= suggest_conflicts();
1581 free(branch_to_free
);