4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
10 #include "parse-options.h"
13 #include "run-command.h"
19 #include "unpack-trees.h"
20 #include "cache-tree.h"
27 #include "merge-recursive.h"
28 #include "resolve-undo.h"
30 #include "fmt-merge-msg.h"
31 #include "gpg-interface.h"
32 #include "sequencer.h"
33 #include "string-list.h"
35 #define DEFAULT_TWOHEAD (1<<0)
36 #define DEFAULT_OCTOPUS (1<<1)
37 #define NO_FAST_FORWARD (1<<2)
38 #define NO_TRIVIAL (1<<3)
45 static const char * const builtin_merge_usage
[] = {
46 N_("git merge [<options>] [<commit>...]"),
47 N_("git merge [<options>] <msg> HEAD <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;
73 static const char *sign_commit
;
75 static struct strategy all_strategy
[] = {
76 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
77 { "octopus", DEFAULT_OCTOPUS
},
79 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
80 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
83 static const char *pull_twohead
, *pull_octopus
;
91 static enum ff_type fast_forward
= FF_ALLOW
;
93 static int option_parse_message(const struct option
*opt
,
94 const char *arg
, int unset
)
96 struct strbuf
*buf
= opt
->value
;
99 strbuf_setlen(buf
, 0);
101 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
104 return error(_("switch `m' requires a value"));
108 static struct strategy
*get_strategy(const char *name
)
111 struct strategy
*ret
;
112 static struct cmdnames main_cmds
, other_cmds
;
118 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
119 if (!strcmp(name
, all_strategy
[i
].name
))
120 return &all_strategy
[i
];
123 struct cmdnames not_strategies
;
126 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
127 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
128 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
130 struct cmdname
*ent
= main_cmds
.names
[i
];
131 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
132 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
133 && !all_strategy
[j
].name
[ent
->len
])
136 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
138 exclude_cmds(&main_cmds
, ¬_strategies
);
140 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
141 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
142 fprintf(stderr
, _("Available strategies are:"));
143 for (i
= 0; i
< main_cmds
.cnt
; i
++)
144 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
145 fprintf(stderr
, ".\n");
146 if (other_cmds
.cnt
) {
147 fprintf(stderr
, _("Available custom strategies are:"));
148 for (i
= 0; i
< other_cmds
.cnt
; i
++)
149 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
150 fprintf(stderr
, ".\n");
155 ret
= xcalloc(1, sizeof(struct strategy
));
156 ret
->name
= xstrdup(name
);
157 ret
->attr
= NO_TRIVIAL
;
161 static void append_strategy(struct strategy
*s
)
163 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
164 use_strategies
[use_strategies_nr
++] = s
;
167 static int option_parse_strategy(const struct option
*opt
,
168 const char *name
, int unset
)
173 append_strategy(get_strategy(name
));
177 static int option_parse_x(const struct option
*opt
,
178 const char *arg
, int unset
)
183 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
184 xopts
[xopts_nr
++] = xstrdup(arg
);
188 static int option_parse_n(const struct option
*opt
,
189 const char *arg
, int unset
)
191 show_diffstat
= unset
;
195 static struct option builtin_merge_options
[] = {
196 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
197 N_("do not show a diffstat at the end of the merge"),
198 PARSE_OPT_NOARG
, option_parse_n
},
199 OPT_BOOL(0, "stat", &show_diffstat
,
200 N_("show a diffstat at the end of the merge")),
201 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
202 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
203 N_("add (at most <n>) entries from shortlog to merge commit message"),
204 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
205 OPT_BOOL(0, "squash", &squash
,
206 N_("create a single commit instead of doing a merge")),
207 OPT_BOOL(0, "commit", &option_commit
,
208 N_("perform a commit if the merge succeeds (default)")),
209 OPT_BOOL('e', "edit", &option_edit
,
210 N_("edit message before committing")),
211 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
212 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
213 N_("abort if fast-forward is not possible"),
214 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
215 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
216 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
217 N_("verify that the named commit has a valid GPG signature")),
218 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
219 N_("merge strategy to use"), option_parse_strategy
),
220 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
221 N_("option for selected merge strategy"), option_parse_x
),
222 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
223 N_("merge commit message (for a non-fast-forward merge)"),
224 option_parse_message
),
225 OPT__VERBOSITY(&verbosity
),
226 OPT_BOOL(0, "abort", &abort_current_merge
,
227 N_("abort the current in-progress merge")),
228 OPT_BOOL(0, "continue", &continue_current_merge
,
229 N_("continue the current in-progress merge")),
230 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories
,
231 N_("allow merging unrelated histories")),
232 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
233 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
234 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
235 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
239 /* Cleans up metadata that is uninteresting after a succeeded merge. */
240 static void drop_save(void)
242 unlink(git_path_merge_head());
243 unlink(git_path_merge_msg());
244 unlink(git_path_merge_mode());
247 static int save_state(struct object_id
*stash
)
250 struct child_process cp
= CHILD_PROCESS_INIT
;
251 struct strbuf buffer
= STRBUF_INIT
;
252 const char *argv
[] = {"stash", "create", NULL
};
258 if (start_command(&cp
))
259 die(_("could not run stash."));
260 len
= strbuf_read(&buffer
, cp
.out
, 1024);
263 if (finish_command(&cp
) || len
< 0)
264 die(_("stash failed"));
265 else if (!len
) /* no changes */
267 strbuf_setlen(&buffer
, buffer
.len
-1);
268 if (get_oid(buffer
.buf
, stash
))
269 die(_("not a valid object: %s"), buffer
.buf
);
273 static void read_empty(unsigned const char *sha1
, int verbose
)
278 args
[i
++] = "read-tree";
283 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
284 args
[i
++] = sha1_to_hex(sha1
);
287 if (run_command_v_opt(args
, RUN_GIT_CMD
))
288 die(_("read-tree failed"));
291 static void reset_hard(unsigned const char *sha1
, int verbose
)
296 args
[i
++] = "read-tree";
299 args
[i
++] = "--reset";
301 args
[i
++] = sha1_to_hex(sha1
);
304 if (run_command_v_opt(args
, RUN_GIT_CMD
))
305 die(_("read-tree failed"));
308 static void restore_state(const struct object_id
*head
,
309 const struct object_id
*stash
)
311 struct strbuf sb
= STRBUF_INIT
;
312 const char *args
[] = { "stash", "apply", NULL
, NULL
};
314 if (is_null_oid(stash
))
317 reset_hard(head
->hash
, 1);
319 args
[2] = oid_to_hex(stash
);
322 * It is OK to ignore error here, for example when there was
323 * nothing to restore.
325 run_command_v_opt(args
, RUN_GIT_CMD
);
328 refresh_cache(REFRESH_QUIET
);
331 /* This is called when no merge was necessary. */
332 static void finish_up_to_date(const char *msg
)
335 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
339 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
342 struct strbuf out
= STRBUF_INIT
;
343 struct commit_list
*j
;
344 struct pretty_print_context ctx
= {0};
346 printf(_("Squash commit -- not updating HEAD\n"));
348 init_revisions(&rev
, NULL
);
349 rev
.ignore_merges
= 1;
350 rev
.commit_format
= CMIT_FMT_MEDIUM
;
352 commit
->object
.flags
|= UNINTERESTING
;
353 add_pending_object(&rev
, &commit
->object
, NULL
);
355 for (j
= remoteheads
; j
; j
= j
->next
)
356 add_pending_object(&rev
, &j
->item
->object
, NULL
);
358 setup_revisions(0, NULL
, &rev
, NULL
);
359 if (prepare_revision_walk(&rev
))
360 die(_("revision walk setup failed"));
362 ctx
.abbrev
= rev
.abbrev
;
363 ctx
.date_mode
= rev
.date_mode
;
364 ctx
.fmt
= rev
.commit_format
;
366 strbuf_addstr(&out
, "Squashed commit of the following:\n");
367 while ((commit
= get_revision(&rev
)) != NULL
) {
368 strbuf_addch(&out
, '\n');
369 strbuf_addf(&out
, "commit %s\n",
370 oid_to_hex(&commit
->object
.oid
));
371 pretty_print_commit(&ctx
, commit
, &out
);
373 write_file_buf(git_path_squash_msg(), out
.buf
, out
.len
);
374 strbuf_release(&out
);
377 static void finish(struct commit
*head_commit
,
378 struct commit_list
*remoteheads
,
379 const struct object_id
*new_head
, const char *msg
)
381 struct strbuf reflog_message
= STRBUF_INIT
;
382 const struct object_id
*head
= &head_commit
->object
.oid
;
385 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
389 strbuf_addf(&reflog_message
, "%s: %s",
390 getenv("GIT_REFLOG_ACTION"), msg
);
393 squash_message(head_commit
, remoteheads
);
395 if (verbosity
>= 0 && !merge_msg
.len
)
396 printf(_("No merge message -- not updating HEAD\n"));
398 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
399 update_ref(reflog_message
.buf
, "HEAD",
400 new_head
->hash
, head
->hash
, 0,
401 UPDATE_REFS_DIE_ON_ERR
);
403 * We ignore errors in 'gc --auto', since the
404 * user should see them.
407 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
410 if (new_head
&& show_diffstat
) {
411 struct diff_options opts
;
413 opts
.stat_width
= -1; /* use full terminal width */
414 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
415 opts
.output_format
|=
416 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
417 opts
.detect_rename
= DIFF_DETECT_RENAME
;
418 diff_setup_done(&opts
);
419 diff_tree_sha1(head
->hash
, new_head
->hash
, "", &opts
);
424 /* Run a post-merge hook */
425 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
427 strbuf_release(&reflog_message
);
430 /* Get the name for the merge commit's message. */
431 static void merge_name(const char *remote
, struct strbuf
*msg
)
433 struct commit
*remote_head
;
434 struct object_id branch_head
;
435 struct strbuf buf
= STRBUF_INIT
;
436 struct strbuf bname
= STRBUF_INIT
;
441 strbuf_branchname(&bname
, remote
);
444 oidclr(&branch_head
);
445 remote_head
= get_merge_parent(remote
);
447 die(_("'%s' does not point to a commit"), remote
);
449 if (dwim_ref(remote
, strlen(remote
), branch_head
.hash
, &found_ref
) > 0) {
450 if (starts_with(found_ref
, "refs/heads/")) {
451 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
452 oid_to_hex(&branch_head
), remote
);
455 if (starts_with(found_ref
, "refs/tags/")) {
456 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
457 oid_to_hex(&branch_head
), remote
);
460 if (starts_with(found_ref
, "refs/remotes/")) {
461 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
462 oid_to_hex(&branch_head
), remote
);
467 /* See if remote matches <name>^^^.. or <name>~<number> */
468 for (len
= 0, ptr
= remote
+ strlen(remote
);
469 remote
< ptr
&& ptr
[-1] == '^';
476 ptr
= strrchr(remote
, '~');
478 int seen_nonzero
= 0;
481 while (*++ptr
&& isdigit(*ptr
)) {
482 seen_nonzero
|= (*ptr
!= '0');
486 len
= 0; /* not ...~<number> */
487 else if (seen_nonzero
)
490 early
= 1; /* "name~" is "name~1"! */
494 struct strbuf truname
= STRBUF_INIT
;
495 strbuf_addf(&truname
, "refs/heads/%s", remote
);
496 strbuf_setlen(&truname
, truname
.len
- len
);
497 if (ref_exists(truname
.buf
)) {
499 "%s\t\tbranch '%s'%s of .\n",
500 oid_to_hex(&remote_head
->object
.oid
),
502 (early
? " (early part)" : ""));
503 strbuf_release(&truname
);
506 strbuf_release(&truname
);
509 if (remote_head
->util
) {
510 struct merge_remote_desc
*desc
;
511 desc
= merge_remote_util(remote_head
);
512 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
513 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
514 oid_to_hex(&desc
->obj
->oid
),
515 typename(desc
->obj
->type
),
521 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
522 oid_to_hex(&remote_head
->object
.oid
), remote
);
524 strbuf_release(&buf
);
525 strbuf_release(&bname
);
528 static void parse_branch_merge_options(char *bmo
)
535 argc
= split_cmdline(bmo
, &argv
);
537 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
538 split_cmdline_strerror(argc
));
539 REALLOC_ARRAY(argv
, argc
+ 2);
540 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
542 argv
[0] = "branch.*.mergeoptions";
543 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
544 builtin_merge_usage
, 0);
548 static int git_merge_config(const char *k
, const char *v
, void *cb
)
552 if (branch
&& starts_with(k
, "branch.") &&
553 starts_with(k
+ 7, branch
) &&
554 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
555 free(branch_mergeoptions
);
556 branch_mergeoptions
= xstrdup(v
);
560 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
561 show_diffstat
= git_config_bool(k
, v
);
562 else if (!strcmp(k
, "pull.twohead"))
563 return git_config_string(&pull_twohead
, k
, v
);
564 else if (!strcmp(k
, "pull.octopus"))
565 return git_config_string(&pull_octopus
, k
, v
);
566 else if (!strcmp(k
, "merge.renormalize"))
567 option_renormalize
= git_config_bool(k
, v
);
568 else if (!strcmp(k
, "merge.ff")) {
569 int boolval
= git_config_maybe_bool(k
, v
);
571 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
572 } else if (v
&& !strcmp(v
, "only")) {
573 fast_forward
= FF_ONLY
;
574 } /* do not barf on values from future versions of git */
576 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
577 default_to_upstream
= git_config_bool(k
, v
);
579 } else if (!strcmp(k
, "commit.gpgsign")) {
580 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
584 status
= fmt_merge_msg_config(k
, v
, cb
);
587 status
= git_gpg_config(k
, v
, NULL
);
590 return git_diff_ui_config(k
, v
, cb
);
593 static int read_tree_trivial(struct object_id
*common
, struct object_id
*head
,
594 struct object_id
*one
)
597 struct tree
*trees
[MAX_UNPACK_TREES
];
598 struct tree_desc t
[MAX_UNPACK_TREES
];
599 struct unpack_trees_options opts
;
601 memset(&opts
, 0, sizeof(opts
));
603 opts
.src_index
= &the_index
;
604 opts
.dst_index
= &the_index
;
606 opts
.verbose_update
= 1;
607 opts
.trivial_merges_only
= 1;
609 trees
[nr_trees
] = parse_tree_indirect(common
->hash
);
610 if (!trees
[nr_trees
++])
612 trees
[nr_trees
] = parse_tree_indirect(head
->hash
);
613 if (!trees
[nr_trees
++])
615 trees
[nr_trees
] = parse_tree_indirect(one
->hash
);
616 if (!trees
[nr_trees
++])
618 opts
.fn
= threeway_merge
;
619 cache_tree_free(&active_cache_tree
);
620 for (i
= 0; i
< nr_trees
; i
++) {
621 parse_tree(trees
[i
]);
622 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
624 if (unpack_trees(nr_trees
, t
, &opts
))
629 static void write_tree_trivial(struct object_id
*oid
)
631 if (write_cache_as_tree(oid
->hash
, 0, NULL
))
632 die(_("git write-tree failed to write a tree"));
635 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
636 struct commit_list
*remoteheads
,
637 struct commit
*head
, const char *head_arg
)
639 static struct lock_file lock
;
641 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
642 refresh_cache(REFRESH_QUIET
);
643 if (active_cache_changed
&&
644 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
645 return error(_("Unable to write index."));
646 rollback_lock_file(&lock
);
648 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
650 struct commit
*result
;
651 struct commit_list
*reversed
= NULL
;
652 struct merge_options o
;
653 struct commit_list
*j
;
655 if (remoteheads
->next
) {
656 error(_("Not handling anything other than two heads merge."));
660 init_merge_options(&o
);
661 if (!strcmp(strategy
, "subtree"))
662 o
.subtree_shift
= "";
664 o
.renormalize
= option_renormalize
;
665 o
.show_rename_progress
=
666 show_progress
== -1 ? isatty(2) : show_progress
;
668 for (x
= 0; x
< xopts_nr
; x
++)
669 if (parse_merge_opt(&o
, xopts
[x
]))
670 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
672 o
.branch1
= head_arg
;
673 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
675 for (j
= common
; j
; j
= j
->next
)
676 commit_list_insert(j
->item
, &reversed
);
678 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
679 clean
= merge_recursive(&o
, head
,
680 remoteheads
->item
, reversed
, &result
);
683 if (active_cache_changed
&&
684 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
685 die (_("unable to write %s"), get_index_file());
686 rollback_lock_file(&lock
);
687 return clean
? 0 : 1;
689 return try_merge_command(strategy
, xopts_nr
, xopts
,
690 common
, head_arg
, remoteheads
);
694 static void count_diff_files(struct diff_queue_struct
*q
,
695 struct diff_options
*opt
, void *data
)
702 static int count_unmerged_entries(void)
706 for (i
= 0; i
< active_nr
; i
++)
707 if (ce_stage(active_cache
[i
]))
713 static void add_strategies(const char *string
, unsigned attr
)
718 struct string_list list
= STRING_LIST_INIT_DUP
;
719 struct string_list_item
*item
;
720 string_list_split(&list
, string
, ' ', -1);
721 for_each_string_list_item(item
, &list
)
722 append_strategy(get_strategy(item
->string
));
723 string_list_clear(&list
, 0);
726 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
727 if (all_strategy
[i
].attr
& attr
)
728 append_strategy(&all_strategy
[i
]);
732 static void read_merge_msg(struct strbuf
*msg
)
734 const char *filename
= git_path_merge_msg();
736 if (strbuf_read_file(msg
, filename
, 0) < 0)
737 die_errno(_("Could not read from '%s'"), filename
);
740 static void write_merge_state(struct commit_list
*);
741 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
744 error("%s", err_msg
);
746 _("Not committing merge; use 'git commit' to complete the merge.\n"));
747 write_merge_state(remoteheads
);
751 static const char merge_editor_comment
[] =
752 N_("Please enter a commit message to explain why this merge is necessary,\n"
753 "especially if it merges an updated upstream into a topic branch.\n"
755 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
758 static void prepare_to_commit(struct commit_list
*remoteheads
)
760 struct strbuf msg
= STRBUF_INIT
;
761 strbuf_addbuf(&msg
, &merge_msg
);
762 strbuf_addch(&msg
, '\n');
764 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
765 write_file_buf(git_path_merge_msg(), msg
.buf
, msg
.len
);
766 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
767 git_path_merge_msg(), "merge", NULL
))
768 abort_commit(remoteheads
, NULL
);
769 if (0 < option_edit
) {
770 if (launch_editor(git_path_merge_msg(), NULL
, NULL
))
771 abort_commit(remoteheads
, NULL
);
773 read_merge_msg(&msg
);
774 strbuf_stripspace(&msg
, 0 < option_edit
);
776 abort_commit(remoteheads
, _("Empty commit message."));
777 strbuf_release(&merge_msg
);
778 strbuf_addbuf(&merge_msg
, &msg
);
779 strbuf_release(&msg
);
782 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
784 struct object_id result_tree
, result_commit
;
785 struct commit_list
*parents
, **pptr
= &parents
;
786 static struct lock_file lock
;
788 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
789 refresh_cache(REFRESH_QUIET
);
790 if (active_cache_changed
&&
791 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
792 return error(_("Unable to write index."));
793 rollback_lock_file(&lock
);
795 write_tree_trivial(&result_tree
);
796 printf(_("Wonderful.\n"));
797 pptr
= commit_list_append(head
, pptr
);
798 pptr
= commit_list_append(remoteheads
->item
, pptr
);
799 prepare_to_commit(remoteheads
);
800 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
.hash
, parents
,
801 result_commit
.hash
, NULL
, sign_commit
))
802 die(_("failed to write commit object"));
803 finish(head
, remoteheads
, &result_commit
, "In-index merge");
808 static int finish_automerge(struct commit
*head
,
810 struct commit_list
*common
,
811 struct commit_list
*remoteheads
,
812 struct object_id
*result_tree
,
813 const char *wt_strategy
)
815 struct commit_list
*parents
= NULL
;
816 struct strbuf buf
= STRBUF_INIT
;
817 struct object_id result_commit
;
819 free_commit_list(common
);
820 parents
= remoteheads
;
821 if (!head_subsumed
|| fast_forward
== FF_NO
)
822 commit_list_insert(head
, &parents
);
823 strbuf_addch(&merge_msg
, '\n');
824 prepare_to_commit(remoteheads
);
825 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
->hash
, parents
,
826 result_commit
.hash
, NULL
, sign_commit
))
827 die(_("failed to write commit object"));
828 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
829 finish(head
, remoteheads
, &result_commit
, buf
.buf
);
830 strbuf_release(&buf
);
835 static int suggest_conflicts(void)
837 const char *filename
;
839 struct strbuf msgbuf
= STRBUF_INIT
;
841 filename
= git_path_merge_msg();
842 fp
= fopen(filename
, "a");
844 die_errno(_("Could not open '%s' for writing"), filename
);
846 append_conflicts_hint(&msgbuf
);
847 fputs(msgbuf
.buf
, fp
);
848 strbuf_release(&msgbuf
);
850 rerere(allow_rerere_auto
);
851 printf(_("Automatic merge failed; "
852 "fix conflicts and then commit the result.\n"));
856 static struct commit
*is_old_style_invocation(int argc
, const char **argv
,
857 const struct object_id
*head
)
859 struct commit
*second_token
= NULL
;
861 struct object_id second_oid
;
863 if (get_oid(argv
[1], &second_oid
))
865 second_token
= lookup_commit_reference_gently(second_oid
.hash
, 0);
867 die(_("'%s' is not a commit"), argv
[1]);
868 if (oidcmp(&second_token
->object
.oid
, head
))
874 static int evaluate_result(void)
879 /* Check how many files differ. */
880 init_revisions(&rev
, "");
881 setup_revisions(0, NULL
, &rev
, NULL
);
882 rev
.diffopt
.output_format
|=
883 DIFF_FORMAT_CALLBACK
;
884 rev
.diffopt
.format_callback
= count_diff_files
;
885 rev
.diffopt
.format_callback_data
= &cnt
;
886 run_diff_files(&rev
, 0);
889 * Check how many unmerged entries are
892 cnt
+= count_unmerged_entries();
898 * Pretend as if the user told us to merge with the remote-tracking
899 * branch we have for the upstream of the current branch
901 static int setup_with_upstream(const char ***argv
)
903 struct branch
*branch
= branch_get(NULL
);
908 die(_("No current branch."));
909 if (!branch
->remote_name
)
910 die(_("No remote for the current branch."));
911 if (!branch
->merge_nr
)
912 die(_("No default upstream defined for the current branch."));
914 args
= xcalloc(st_add(branch
->merge_nr
, 1), sizeof(char *));
915 for (i
= 0; i
< branch
->merge_nr
; i
++) {
916 if (!branch
->merge
[i
]->dst
)
917 die(_("No remote-tracking branch for %s from %s"),
918 branch
->merge
[i
]->src
, branch
->remote_name
);
919 args
[i
] = branch
->merge
[i
]->dst
;
926 static void write_merge_state(struct commit_list
*remoteheads
)
928 struct commit_list
*j
;
929 struct strbuf buf
= STRBUF_INIT
;
931 for (j
= remoteheads
; j
; j
= j
->next
) {
932 struct object_id
*oid
;
933 struct commit
*c
= j
->item
;
934 if (c
->util
&& merge_remote_util(c
)->obj
) {
935 oid
= &merge_remote_util(c
)->obj
->oid
;
937 oid
= &c
->object
.oid
;
939 strbuf_addf(&buf
, "%s\n", oid_to_hex(oid
));
941 write_file_buf(git_path_merge_head(), buf
.buf
, buf
.len
);
942 strbuf_addch(&merge_msg
, '\n');
943 write_file_buf(git_path_merge_msg(), merge_msg
.buf
, merge_msg
.len
);
946 if (fast_forward
== FF_NO
)
947 strbuf_addstr(&buf
, "no-ff");
948 write_file_buf(git_path_merge_mode(), buf
.buf
, buf
.len
);
951 static int default_edit_option(void)
953 static const char name
[] = "GIT_MERGE_AUTOEDIT";
954 const char *e
= getenv(name
);
955 struct stat st_stdin
, st_stdout
;
958 /* an explicit -m msg without --[no-]edit */
962 int v
= git_config_maybe_bool(name
, e
);
964 die(_("Bad value '%s' in environment '%s'"), e
, name
);
968 /* Use editor if stdin and stdout are the same and is a tty */
969 return (!fstat(0, &st_stdin
) &&
970 !fstat(1, &st_stdout
) &&
971 isatty(0) && isatty(1) &&
972 st_stdin
.st_dev
== st_stdout
.st_dev
&&
973 st_stdin
.st_ino
== st_stdout
.st_ino
&&
974 st_stdin
.st_mode
== st_stdout
.st_mode
);
977 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
979 struct commit_list
*remoteheads
)
981 struct commit_list
*parents
, **remotes
;
984 * Is the current HEAD reachable from another commit being
985 * merged? If so we do not want to record it as a parent of
986 * the resulting merge, unless --no-ff is given. We will flip
987 * this variable to 0 when we find HEAD among the independent
992 /* Find what parents to record by checking independent ones. */
993 parents
= reduce_heads(remoteheads
);
996 remotes
= &remoteheads
;
998 struct commit
*commit
= pop_commit(&parents
);
999 if (commit
== head_commit
)
1002 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1007 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
1009 struct fmt_merge_msg_opts opts
;
1011 memset(&opts
, 0, sizeof(opts
));
1012 opts
.add_title
= !have_message
;
1013 opts
.shortlog_len
= shortlog_len
;
1014 opts
.credit_people
= (0 < option_edit
);
1016 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1018 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1021 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1023 const char *filename
;
1025 struct strbuf fetch_head_file
= STRBUF_INIT
;
1028 merge_names
= &fetch_head_file
;
1030 filename
= git_path_fetch_head();
1031 fd
= open(filename
, O_RDONLY
);
1033 die_errno(_("could not open '%s' for reading"), filename
);
1035 if (strbuf_read(merge_names
, fd
, 0) < 0)
1036 die_errno(_("could not read '%s'"), filename
);
1038 die_errno(_("could not close '%s'"), filename
);
1040 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1041 struct object_id oid
;
1043 struct commit
*commit
;
1045 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1047 npos
= ptr
- merge_names
->buf
+ 1;
1049 npos
= merge_names
->len
;
1051 if (npos
- pos
< GIT_SHA1_HEXSZ
+ 2 ||
1052 get_oid_hex(merge_names
->buf
+ pos
, &oid
))
1053 commit
= NULL
; /* bad */
1054 else if (memcmp(merge_names
->buf
+ pos
+ GIT_SHA1_HEXSZ
, "\t\t", 2))
1055 continue; /* not-for-merge */
1057 char saved
= merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
];
1058 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = '\0';
1059 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1060 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = saved
;
1065 die(_("not something we can merge in %s: %s"),
1066 filename
, merge_names
->buf
+ pos
);
1068 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1071 if (merge_names
== &fetch_head_file
)
1072 strbuf_release(&fetch_head_file
);
1075 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1077 int argc
, const char **argv
,
1078 struct strbuf
*merge_msg
)
1081 struct commit_list
*remoteheads
= NULL
;
1082 struct commit_list
**remotes
= &remoteheads
;
1083 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1085 if (merge_msg
&& (!have_message
|| shortlog_len
))
1086 autogen
= &merge_names
;
1089 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1091 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1092 handle_fetch_head(remotes
, autogen
);
1093 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1095 for (i
= 0; i
< argc
; i
++) {
1096 struct commit
*commit
= get_merge_parent(argv
[i
]);
1098 help_unknown_ref(argv
[i
], "merge",
1099 _("not something we can merge"));
1100 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1102 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1104 struct commit_list
*p
;
1105 for (p
= remoteheads
; p
; p
= p
->next
)
1106 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1111 prepare_merge_message(autogen
, merge_msg
);
1112 strbuf_release(autogen
);
1118 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1120 struct object_id result_tree
, stash
, head_oid
;
1121 struct commit
*head_commit
;
1122 struct strbuf buf
= STRBUF_INIT
;
1123 const char *head_arg
;
1124 int i
, ret
= 0, head_subsumed
;
1125 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1126 struct commit_list
*common
= NULL
;
1127 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1128 struct commit_list
*remoteheads
, *p
;
1129 void *branch_to_free
;
1130 int orig_argc
= argc
;
1132 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1133 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1136 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1139 branch
= branch_to_free
= resolve_refdup("HEAD", 0, head_oid
.hash
, NULL
);
1140 if (branch
&& starts_with(branch
, "refs/heads/"))
1142 if (!branch
|| is_null_oid(&head_oid
))
1145 head_commit
= lookup_commit_or_die(head_oid
.hash
, "HEAD");
1147 init_diff_ui_defaults();
1148 git_config(git_merge_config
, NULL
);
1150 if (branch_mergeoptions
)
1151 parse_branch_merge_options(branch_mergeoptions
);
1152 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1153 builtin_merge_usage
, 0);
1154 if (shortlog_len
< 0)
1155 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1157 if (verbosity
< 0 && show_progress
== -1)
1160 if (abort_current_merge
) {
1162 const char *nargv
[] = {"reset", "--merge", NULL
};
1165 usage_msg_opt(_("--abort expects no arguments"),
1166 builtin_merge_usage
, builtin_merge_options
);
1168 if (!file_exists(git_path_merge_head()))
1169 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1171 /* Invoke 'git reset --merge' */
1172 ret
= cmd_reset(nargc
, nargv
, prefix
);
1176 if (continue_current_merge
) {
1178 const char *nargv
[] = {"commit", NULL
};
1181 usage_msg_opt(_("--continue expects no arguments"),
1182 builtin_merge_usage
, builtin_merge_options
);
1184 if (!file_exists(git_path_merge_head()))
1185 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1187 /* Invoke 'git commit' */
1188 ret
= cmd_commit(nargc
, nargv
, prefix
);
1192 if (read_cache_unmerged())
1193 die_resolve_conflict("merge");
1195 if (file_exists(git_path_merge_head())) {
1197 * There is no unmerged entry, don't advise 'git
1198 * add/rm <file>', just 'git commit'.
1200 if (advice_resolve_conflict
)
1201 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1202 "Please, commit your changes before you merge."));
1204 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1206 if (file_exists(git_path_cherry_pick_head())) {
1207 if (advice_resolve_conflict
)
1208 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1209 "Please, commit your changes before you merge."));
1211 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1213 resolve_undo_clear();
1219 if (fast_forward
== FF_NO
)
1220 die(_("You cannot combine --squash with --no-ff."));
1225 if (default_to_upstream
)
1226 argc
= setup_with_upstream(&argv
);
1228 die(_("No commit specified and merge.defaultToUpstream not set."));
1229 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1234 usage_with_options(builtin_merge_usage
,
1235 builtin_merge_options
);
1239 * If the merged head is a valid one there is no reason
1240 * to forbid "git merge" into a branch yet to be born.
1241 * We do the same for "git pull".
1243 struct object_id
*remote_head_oid
;
1245 die(_("Squash commit into empty head not supported yet"));
1246 if (fast_forward
== FF_NO
)
1247 die(_("Non-fast-forward commit does not make sense into "
1249 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1252 die(_("%s - not something we can merge"), argv
[0]);
1253 if (remoteheads
->next
)
1254 die(_("Can merge only exactly one commit into empty head"));
1255 remote_head_oid
= &remoteheads
->item
->object
.oid
;
1256 read_empty(remote_head_oid
->hash
, 0);
1257 update_ref("initial pull", "HEAD", remote_head_oid
->hash
,
1258 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1263 * This could be traditional "merge <msg> HEAD <commit>..." and
1264 * the way we can tell it is to see if the second token is HEAD,
1265 * but some people might have misused the interface and used a
1266 * commit-ish that is the same as HEAD there instead.
1267 * Traditional format never would have "-m" so it is an
1268 * additional safety measure to check for it.
1270 if (!have_message
&&
1271 is_old_style_invocation(argc
, argv
, &head_commit
->object
.oid
)) {
1272 warning("old-style 'git merge <msg> HEAD <commit>' is deprecated.");
1273 strbuf_addstr(&merge_msg
, argv
[0]);
1277 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1280 /* We are invoked directly as the first-class UI. */
1284 * All the rest are the commits being merged; prepare
1285 * the standard merge summary message to be appended
1286 * to the given message.
1288 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1289 argc
, argv
, &merge_msg
);
1292 if (!head_commit
|| !argc
)
1293 usage_with_options(builtin_merge_usage
,
1294 builtin_merge_options
);
1296 if (verify_signatures
) {
1297 for (p
= remoteheads
; p
; p
= p
->next
) {
1298 struct commit
*commit
= p
->item
;
1299 char hex
[GIT_SHA1_HEXSZ
+ 1];
1300 struct signature_check signature_check
;
1301 memset(&signature_check
, 0, sizeof(signature_check
));
1303 check_commit_signature(commit
, &signature_check
);
1305 find_unique_abbrev_r(hex
, commit
->object
.oid
.hash
, DEFAULT_ABBREV
);
1306 switch (signature_check
.result
) {
1310 die(_("Commit %s has an untrusted GPG signature, "
1311 "allegedly by %s."), hex
, signature_check
.signer
);
1313 die(_("Commit %s has a bad GPG signature "
1314 "allegedly by %s."), hex
, signature_check
.signer
);
1316 die(_("Commit %s does not have a GPG signature."), hex
);
1318 if (verbosity
>= 0 && signature_check
.result
== 'G')
1319 printf(_("Commit %s has a good GPG signature by %s\n"),
1320 hex
, signature_check
.signer
);
1322 signature_check_clear(&signature_check
);
1326 strbuf_addstr(&buf
, "merge");
1327 for (p
= remoteheads
; p
; p
= p
->next
)
1328 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1329 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1332 for (p
= remoteheads
; p
; p
= p
->next
) {
1333 struct commit
*commit
= p
->item
;
1334 strbuf_addf(&buf
, "GITHEAD_%s",
1335 oid_to_hex(&commit
->object
.oid
));
1336 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1338 if (fast_forward
!= FF_ONLY
&&
1339 merge_remote_util(commit
) &&
1340 merge_remote_util(commit
)->obj
&&
1341 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1342 fast_forward
= FF_NO
;
1345 if (option_edit
< 0)
1346 option_edit
= default_edit_option();
1348 if (!use_strategies
) {
1350 ; /* already up-to-date */
1351 else if (!remoteheads
->next
)
1352 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1354 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1357 for (i
= 0; i
< use_strategies_nr
; i
++) {
1358 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1359 fast_forward
= FF_NO
;
1360 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1365 ; /* already up-to-date */
1366 else if (!remoteheads
->next
)
1367 common
= get_merge_bases(head_commit
, remoteheads
->item
);
1369 struct commit_list
*list
= remoteheads
;
1370 commit_list_insert(head_commit
, &list
);
1371 common
= get_octopus_merge_bases(list
);
1375 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.oid
.hash
,
1376 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1378 if (remoteheads
&& !common
) {
1379 /* No common ancestors found. */
1380 if (!allow_unrelated_histories
)
1381 die(_("refusing to merge unrelated histories"));
1382 /* otherwise, we need a real merge. */
1383 } else if (!remoteheads
||
1384 (!remoteheads
->next
&& !common
->next
&&
1385 common
->item
== remoteheads
->item
)) {
1387 * If head can reach all the merge then we are up to date.
1388 * but first the most common case of merging one remote.
1390 finish_up_to_date(_("Already up-to-date."));
1392 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1394 !oidcmp(&common
->item
->object
.oid
, &head_commit
->object
.oid
)) {
1395 /* Again the most common case of merging one remote. */
1396 struct strbuf msg
= STRBUF_INIT
;
1397 struct commit
*commit
;
1399 if (verbosity
>= 0) {
1400 printf(_("Updating %s..%s\n"),
1401 find_unique_abbrev(head_commit
->object
.oid
.hash
,
1403 find_unique_abbrev(remoteheads
->item
->object
.oid
.hash
,
1406 strbuf_addstr(&msg
, "Fast-forward");
1409 " (no commit created; -m option ignored)");
1410 commit
= remoteheads
->item
;
1416 if (checkout_fast_forward(head_commit
->object
.oid
.hash
,
1417 commit
->object
.oid
.hash
,
1418 overwrite_ignore
)) {
1423 finish(head_commit
, remoteheads
, &commit
->object
.oid
, msg
.buf
);
1426 } else if (!remoteheads
->next
&& common
->next
)
1429 * We are not doing octopus and not fast-forward. Need
1432 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1434 * We are not doing octopus, not fast-forward, and have
1437 refresh_cache(REFRESH_QUIET
);
1438 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1439 /* See if it is really trivial. */
1440 git_committer_info(IDENT_STRICT
);
1441 printf(_("Trying really trivial in-index merge...\n"));
1442 if (!read_tree_trivial(&common
->item
->object
.oid
,
1443 &head_commit
->object
.oid
,
1444 &remoteheads
->item
->object
.oid
)) {
1445 ret
= merge_trivial(head_commit
, remoteheads
);
1448 printf(_("Nope.\n"));
1452 * An octopus. If we can reach all the remote we are up
1456 struct commit_list
*j
;
1458 for (j
= remoteheads
; j
; j
= j
->next
) {
1459 struct commit_list
*common_one
;
1462 * Here we *have* to calculate the individual
1463 * merge_bases again, otherwise "git merge HEAD^
1464 * HEAD^^" would be missed.
1466 common_one
= get_merge_bases(head_commit
, j
->item
);
1467 if (oidcmp(&common_one
->item
->object
.oid
, &j
->item
->object
.oid
)) {
1473 finish_up_to_date(_("Already up-to-date. Yeeah!"));
1478 if (fast_forward
== FF_ONLY
)
1479 die(_("Not possible to fast-forward, aborting."));
1481 /* We are going to make a new commit. */
1482 git_committer_info(IDENT_STRICT
);
1485 * At this point, we need a real merge. No matter what strategy
1486 * we use, it would operate on the index, possibly affecting the
1487 * working tree, and when resolved cleanly, have the desired
1488 * tree in the index -- this means that the index must be in
1489 * sync with the head commit. The strategies are responsible
1492 if (use_strategies_nr
== 1 ||
1494 * Stash away the local changes so that we can try more than one.
1499 for (i
= 0; i
< use_strategies_nr
; i
++) {
1502 printf(_("Rewinding the tree to pristine...\n"));
1503 restore_state(&head_commit
->object
.oid
, &stash
);
1505 if (use_strategies_nr
!= 1)
1506 printf(_("Trying merge strategy %s...\n"),
1507 use_strategies
[i
]->name
);
1509 * Remember which strategy left the state in the working
1512 wt_strategy
= use_strategies
[i
]->name
;
1514 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1515 common
, remoteheads
,
1516 head_commit
, head_arg
);
1517 if (!option_commit
&& !ret
) {
1520 * This is necessary here just to avoid writing
1521 * the tree, but later we will *not* exit with
1522 * status code 1 because merge_was_ok is set.
1529 * The backend exits with 1 when conflicts are
1530 * left to be resolved, with 2 when it does not
1531 * handle the given merge at all.
1534 int cnt
= evaluate_result();
1536 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1537 best_strategy
= use_strategies
[i
]->name
;
1547 /* Automerge succeeded. */
1548 write_tree_trivial(&result_tree
);
1549 automerge_was_ok
= 1;
1554 * If we have a resulting tree, that means the strategy module
1555 * auto resolved the merge cleanly.
1557 if (automerge_was_ok
) {
1558 ret
= finish_automerge(head_commit
, head_subsumed
,
1559 common
, remoteheads
,
1560 &result_tree
, wt_strategy
);
1565 * Pick the result from the best strategy and have the user fix
1568 if (!best_strategy
) {
1569 restore_state(&head_commit
->object
.oid
, &stash
);
1570 if (use_strategies_nr
> 1)
1572 _("No merge strategy handled the merge.\n"));
1574 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1575 use_strategies
[0]->name
);
1578 } else if (best_strategy
== wt_strategy
)
1579 ; /* We already have its result in the working tree. */
1581 printf(_("Rewinding the tree to pristine...\n"));
1582 restore_state(&head_commit
->object
.oid
, &stash
);
1583 printf(_("Using the %s to prepare resolving by hand.\n"),
1585 try_merge_strategy(best_strategy
, common
, remoteheads
,
1586 head_commit
, head_arg
);
1590 finish(head_commit
, remoteheads
, NULL
, NULL
);
1592 write_merge_state(remoteheads
);
1595 fprintf(stderr
, _("Automatic merge went well; "
1596 "stopped before committing as requested\n"));
1598 ret
= suggest_conflicts();
1601 free(branch_to_free
);