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"
33 #define DEFAULT_TWOHEAD (1<<0)
34 #define DEFAULT_OCTOPUS (1<<1)
35 #define NO_FAST_FORWARD (1<<2)
36 #define NO_TRIVIAL (1<<3)
43 static const char * const builtin_merge_usage
[] = {
44 N_("git merge [options] [<commit>...]"),
45 N_("git merge [options] <msg> HEAD <commit>"),
46 N_("git merge --abort"),
50 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
51 static int option_commit
= 1;
52 static int option_edit
= -1;
53 static int allow_trivial
= 1, have_message
, verify_signatures
;
54 static int overwrite_ignore
= 1;
55 static struct strbuf merge_msg
= STRBUF_INIT
;
56 static struct strategy
**use_strategies
;
57 static size_t use_strategies_nr
, use_strategies_alloc
;
58 static const char **xopts
;
59 static size_t xopts_nr
, xopts_alloc
;
60 static const char *branch
;
61 static char *branch_mergeoptions
;
62 static int option_renormalize
;
64 static int allow_rerere_auto
;
65 static int abort_current_merge
;
66 static int show_progress
= -1;
67 static int default_to_upstream
= 1;
68 static const char *sign_commit
;
70 static struct strategy all_strategy
[] = {
71 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
72 { "octopus", DEFAULT_OCTOPUS
},
74 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
75 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
78 static const char *pull_twohead
, *pull_octopus
;
86 static enum ff_type fast_forward
= FF_ALLOW
;
88 static int option_parse_message(const struct option
*opt
,
89 const char *arg
, int unset
)
91 struct strbuf
*buf
= opt
->value
;
94 strbuf_setlen(buf
, 0);
96 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
99 return error(_("switch `m' requires a value"));
103 static struct strategy
*get_strategy(const char *name
)
106 struct strategy
*ret
;
107 static struct cmdnames main_cmds
, other_cmds
;
113 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
114 if (!strcmp(name
, all_strategy
[i
].name
))
115 return &all_strategy
[i
];
118 struct cmdnames not_strategies
;
121 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
122 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
123 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
125 struct cmdname
*ent
= main_cmds
.names
[i
];
126 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
127 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
128 && !all_strategy
[j
].name
[ent
->len
])
131 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
133 exclude_cmds(&main_cmds
, ¬_strategies
);
135 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
136 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
137 fprintf(stderr
, _("Available strategies are:"));
138 for (i
= 0; i
< main_cmds
.cnt
; i
++)
139 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
140 fprintf(stderr
, ".\n");
141 if (other_cmds
.cnt
) {
142 fprintf(stderr
, _("Available custom strategies are:"));
143 for (i
= 0; i
< other_cmds
.cnt
; i
++)
144 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
145 fprintf(stderr
, ".\n");
150 ret
= xcalloc(1, sizeof(struct strategy
));
151 ret
->name
= xstrdup(name
);
152 ret
->attr
= NO_TRIVIAL
;
156 static void append_strategy(struct strategy
*s
)
158 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
159 use_strategies
[use_strategies_nr
++] = s
;
162 static int option_parse_strategy(const struct option
*opt
,
163 const char *name
, int unset
)
168 append_strategy(get_strategy(name
));
172 static int option_parse_x(const struct option
*opt
,
173 const char *arg
, int unset
)
178 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
179 xopts
[xopts_nr
++] = xstrdup(arg
);
183 static int option_parse_n(const struct option
*opt
,
184 const char *arg
, int unset
)
186 show_diffstat
= unset
;
190 static struct option builtin_merge_options
[] = {
191 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
192 N_("do not show a diffstat at the end of the merge"),
193 PARSE_OPT_NOARG
, option_parse_n
},
194 OPT_BOOL(0, "stat", &show_diffstat
,
195 N_("show a diffstat at the end of the merge")),
196 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
197 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
198 N_("add (at most <n>) entries from shortlog to merge commit message"),
199 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
200 OPT_BOOL(0, "squash", &squash
,
201 N_("create a single commit instead of doing a merge")),
202 OPT_BOOL(0, "commit", &option_commit
,
203 N_("perform a commit if the merge succeeds (default)")),
204 OPT_BOOL('e', "edit", &option_edit
,
205 N_("edit message before committing")),
206 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
207 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
208 N_("abort if fast-forward is not possible"),
209 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
210 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
211 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
212 N_("Verify that the named commit has a valid GPG signature")),
213 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
214 N_("merge strategy to use"), option_parse_strategy
),
215 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
216 N_("option for selected merge strategy"), option_parse_x
),
217 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
218 N_("merge commit message (for a non-fast-forward merge)"),
219 option_parse_message
),
220 OPT__VERBOSITY(&verbosity
),
221 OPT_BOOL(0, "abort", &abort_current_merge
,
222 N_("abort the current in-progress merge")),
223 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
224 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
225 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
226 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
230 /* Cleans up metadata that is uninteresting after a succeeded merge. */
231 static void drop_save(void)
233 unlink(git_path("MERGE_HEAD"));
234 unlink(git_path("MERGE_MSG"));
235 unlink(git_path("MERGE_MODE"));
238 static int save_state(unsigned char *stash
)
241 struct child_process cp
= CHILD_PROCESS_INIT
;
242 struct strbuf buffer
= STRBUF_INIT
;
243 const char *argv
[] = {"stash", "create", NULL
};
249 if (start_command(&cp
))
250 die(_("could not run stash."));
251 len
= strbuf_read(&buffer
, cp
.out
, 1024);
254 if (finish_command(&cp
) || len
< 0)
255 die(_("stash failed"));
256 else if (!len
) /* no changes */
258 strbuf_setlen(&buffer
, buffer
.len
-1);
259 if (get_sha1(buffer
.buf
, stash
))
260 die(_("not a valid object: %s"), buffer
.buf
);
264 static void read_empty(unsigned const char *sha1
, int verbose
)
269 args
[i
++] = "read-tree";
274 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
275 args
[i
++] = sha1_to_hex(sha1
);
278 if (run_command_v_opt(args
, RUN_GIT_CMD
))
279 die(_("read-tree failed"));
282 static void reset_hard(unsigned const char *sha1
, int verbose
)
287 args
[i
++] = "read-tree";
290 args
[i
++] = "--reset";
292 args
[i
++] = sha1_to_hex(sha1
);
295 if (run_command_v_opt(args
, RUN_GIT_CMD
))
296 die(_("read-tree failed"));
299 static void restore_state(const unsigned char *head
,
300 const unsigned char *stash
)
302 struct strbuf sb
= STRBUF_INIT
;
303 const char *args
[] = { "stash", "apply", NULL
, NULL
};
305 if (is_null_sha1(stash
))
310 args
[2] = sha1_to_hex(stash
);
313 * It is OK to ignore error here, for example when there was
314 * nothing to restore.
316 run_command_v_opt(args
, RUN_GIT_CMD
);
319 refresh_cache(REFRESH_QUIET
);
322 /* This is called when no merge was necessary. */
323 static void finish_up_to_date(const char *msg
)
326 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
330 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
333 struct strbuf out
= STRBUF_INIT
;
334 struct commit_list
*j
;
335 const char *filename
;
337 struct pretty_print_context ctx
= {0};
339 printf(_("Squash commit -- not updating HEAD\n"));
340 filename
= git_path("SQUASH_MSG");
341 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
343 die_errno(_("Could not write to '%s'"), filename
);
345 init_revisions(&rev
, NULL
);
346 rev
.ignore_merges
= 1;
347 rev
.commit_format
= CMIT_FMT_MEDIUM
;
349 commit
->object
.flags
|= UNINTERESTING
;
350 add_pending_object(&rev
, &commit
->object
, NULL
);
352 for (j
= remoteheads
; j
; j
= j
->next
)
353 add_pending_object(&rev
, &j
->item
->object
, NULL
);
355 setup_revisions(0, NULL
, &rev
, NULL
);
356 if (prepare_revision_walk(&rev
))
357 die(_("revision walk setup failed"));
359 ctx
.abbrev
= rev
.abbrev
;
360 ctx
.date_mode
= rev
.date_mode
;
361 ctx
.fmt
= rev
.commit_format
;
363 strbuf_addstr(&out
, "Squashed commit of the following:\n");
364 while ((commit
= get_revision(&rev
)) != NULL
) {
365 strbuf_addch(&out
, '\n');
366 strbuf_addf(&out
, "commit %s\n",
367 sha1_to_hex(commit
->object
.sha1
));
368 pretty_print_commit(&ctx
, commit
, &out
);
370 if (write_in_full(fd
, out
.buf
, out
.len
) != out
.len
)
371 die_errno(_("Writing SQUASH_MSG"));
373 die_errno(_("Finishing SQUASH_MSG"));
374 strbuf_release(&out
);
377 static void finish(struct commit
*head_commit
,
378 struct commit_list
*remoteheads
,
379 const unsigned char *new_head
, const char *msg
)
381 struct strbuf reflog_message
= STRBUF_INIT
;
382 const unsigned char *head
= head_commit
->object
.sha1
;
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",
401 UPDATE_REFS_DIE_ON_ERR
);
403 * We ignore errors in 'gc --auto', since the
404 * user should see them.
406 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
409 if (new_head
&& show_diffstat
) {
410 struct diff_options opts
;
412 opts
.stat_width
= -1; /* use full terminal width */
413 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
414 opts
.output_format
|=
415 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
416 opts
.detect_rename
= DIFF_DETECT_RENAME
;
417 diff_setup_done(&opts
);
418 diff_tree_sha1(head
, new_head
, "", &opts
);
423 /* Run a post-merge hook */
424 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
426 strbuf_release(&reflog_message
);
429 /* Get the name for the merge commit's message. */
430 static void merge_name(const char *remote
, struct strbuf
*msg
)
432 struct commit
*remote_head
;
433 unsigned char branch_head
[20];
434 struct strbuf buf
= STRBUF_INIT
;
435 struct strbuf bname
= STRBUF_INIT
;
440 strbuf_branchname(&bname
, remote
);
443 memset(branch_head
, 0, sizeof(branch_head
));
444 remote_head
= get_merge_parent(remote
);
446 die(_("'%s' does not point to a commit"), remote
);
448 if (dwim_ref(remote
, strlen(remote
), branch_head
, &found_ref
) > 0) {
449 if (starts_with(found_ref
, "refs/heads/")) {
450 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
451 sha1_to_hex(branch_head
), remote
);
454 if (starts_with(found_ref
, "refs/tags/")) {
455 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
456 sha1_to_hex(branch_head
), remote
);
459 if (starts_with(found_ref
, "refs/remotes/")) {
460 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
461 sha1_to_hex(branch_head
), remote
);
466 /* See if remote matches <name>^^^.. or <name>~<number> */
467 for (len
= 0, ptr
= remote
+ strlen(remote
);
468 remote
< ptr
&& ptr
[-1] == '^';
475 ptr
= strrchr(remote
, '~');
477 int seen_nonzero
= 0;
480 while (*++ptr
&& isdigit(*ptr
)) {
481 seen_nonzero
|= (*ptr
!= '0');
485 len
= 0; /* not ...~<number> */
486 else if (seen_nonzero
)
489 early
= 1; /* "name~" is "name~1"! */
493 struct strbuf truname
= STRBUF_INIT
;
494 strbuf_addf(&truname
, "refs/heads/%s", remote
);
495 strbuf_setlen(&truname
, truname
.len
- len
);
496 if (ref_exists(truname
.buf
)) {
498 "%s\t\tbranch '%s'%s of .\n",
499 sha1_to_hex(remote_head
->object
.sha1
),
501 (early
? " (early part)" : ""));
502 strbuf_release(&truname
);
505 strbuf_release(&truname
);
508 if (remote_head
->util
) {
509 struct merge_remote_desc
*desc
;
510 desc
= merge_remote_util(remote_head
);
511 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
512 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
513 sha1_to_hex(desc
->obj
->sha1
),
514 typename(desc
->obj
->type
),
520 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
521 sha1_to_hex(remote_head
->object
.sha1
), remote
);
523 strbuf_release(&buf
);
524 strbuf_release(&bname
);
527 static void parse_branch_merge_options(char *bmo
)
534 argc
= split_cmdline(bmo
, &argv
);
536 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
537 split_cmdline_strerror(argc
));
538 REALLOC_ARRAY(argv
, argc
+ 2);
539 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
541 argv
[0] = "branch.*.mergeoptions";
542 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
543 builtin_merge_usage
, 0);
547 static int git_merge_config(const char *k
, const char *v
, void *cb
)
551 if (branch
&& starts_with(k
, "branch.") &&
552 starts_with(k
+ 7, branch
) &&
553 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
554 free(branch_mergeoptions
);
555 branch_mergeoptions
= xstrdup(v
);
559 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
560 show_diffstat
= git_config_bool(k
, v
);
561 else if (!strcmp(k
, "pull.twohead"))
562 return git_config_string(&pull_twohead
, k
, v
);
563 else if (!strcmp(k
, "pull.octopus"))
564 return git_config_string(&pull_octopus
, k
, v
);
565 else if (!strcmp(k
, "merge.renormalize"))
566 option_renormalize
= git_config_bool(k
, v
);
567 else if (!strcmp(k
, "merge.ff")) {
568 int boolval
= git_config_maybe_bool(k
, v
);
570 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
571 } else if (v
&& !strcmp(v
, "only")) {
572 fast_forward
= FF_ONLY
;
573 } /* do not barf on values from future versions of git */
575 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
576 default_to_upstream
= git_config_bool(k
, v
);
578 } else if (!strcmp(k
, "commit.gpgsign")) {
579 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
583 status
= fmt_merge_msg_config(k
, v
, cb
);
586 status
= git_gpg_config(k
, v
, NULL
);
589 return git_diff_ui_config(k
, v
, cb
);
592 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
596 struct tree
*trees
[MAX_UNPACK_TREES
];
597 struct tree_desc t
[MAX_UNPACK_TREES
];
598 struct unpack_trees_options opts
;
600 memset(&opts
, 0, sizeof(opts
));
602 opts
.src_index
= &the_index
;
603 opts
.dst_index
= &the_index
;
605 opts
.verbose_update
= 1;
606 opts
.trivial_merges_only
= 1;
608 trees
[nr_trees
] = parse_tree_indirect(common
);
609 if (!trees
[nr_trees
++])
611 trees
[nr_trees
] = parse_tree_indirect(head
);
612 if (!trees
[nr_trees
++])
614 trees
[nr_trees
] = parse_tree_indirect(one
);
615 if (!trees
[nr_trees
++])
617 opts
.fn
= threeway_merge
;
618 cache_tree_free(&active_cache_tree
);
619 for (i
= 0; i
< nr_trees
; i
++) {
620 parse_tree(trees
[i
]);
621 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
623 if (unpack_trees(nr_trees
, t
, &opts
))
628 static void write_tree_trivial(unsigned char *sha1
)
630 if (write_cache_as_tree(sha1
, 0, NULL
))
631 die(_("git write-tree failed to write a tree"));
634 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
635 struct commit_list
*remoteheads
,
636 struct commit
*head
, const char *head_arg
)
638 static struct lock_file lock
;
640 hold_locked_index(&lock
, 1);
641 refresh_cache(REFRESH_QUIET
);
642 if (active_cache_changed
&&
643 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
644 return error(_("Unable to write index."));
645 rollback_lock_file(&lock
);
647 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
649 struct commit
*result
;
650 struct commit_list
*reversed
= NULL
;
651 struct merge_options o
;
652 struct commit_list
*j
;
654 if (remoteheads
->next
) {
655 error(_("Not handling anything other than two heads merge."));
659 init_merge_options(&o
);
660 if (!strcmp(strategy
, "subtree"))
661 o
.subtree_shift
= "";
663 o
.renormalize
= option_renormalize
;
664 o
.show_rename_progress
=
665 show_progress
== -1 ? isatty(2) : show_progress
;
667 for (x
= 0; x
< xopts_nr
; x
++)
668 if (parse_merge_opt(&o
, xopts
[x
]))
669 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
671 o
.branch1
= head_arg
;
672 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
674 for (j
= common
; j
; j
= j
->next
)
675 commit_list_insert(j
->item
, &reversed
);
677 hold_locked_index(&lock
, 1);
678 clean
= merge_recursive(&o
, head
,
679 remoteheads
->item
, reversed
, &result
);
680 if (active_cache_changed
&&
681 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
682 die (_("unable to write %s"), get_index_file());
683 rollback_lock_file(&lock
);
684 return clean
? 0 : 1;
686 return try_merge_command(strategy
, xopts_nr
, xopts
,
687 common
, head_arg
, remoteheads
);
691 static void count_diff_files(struct diff_queue_struct
*q
,
692 struct diff_options
*opt
, void *data
)
699 static int count_unmerged_entries(void)
703 for (i
= 0; i
< active_nr
; i
++)
704 if (ce_stage(active_cache
[i
]))
710 static void split_merge_strategies(const char *string
, struct strategy
**list
,
718 buf
= xstrdup(string
);
723 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
724 (*list
)[(*nr
)++].name
= xstrdup(q
);
729 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
730 (*list
)[(*nr
)++].name
= xstrdup(q
);
736 static void add_strategies(const char *string
, unsigned attr
)
738 struct strategy
*list
= NULL
;
739 int list_alloc
= 0, list_nr
= 0, i
;
741 memset(&list
, 0, sizeof(list
));
742 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
744 for (i
= 0; i
< list_nr
; i
++)
745 append_strategy(get_strategy(list
[i
].name
));
748 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
749 if (all_strategy
[i
].attr
& attr
)
750 append_strategy(&all_strategy
[i
]);
754 static void write_merge_msg(struct strbuf
*msg
)
756 const char *filename
= git_path("MERGE_MSG");
757 int fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
759 die_errno(_("Could not open '%s' for writing"),
761 if (write_in_full(fd
, msg
->buf
, msg
->len
) != msg
->len
)
762 die_errno(_("Could not write to '%s'"), filename
);
766 static void read_merge_msg(struct strbuf
*msg
)
768 const char *filename
= git_path("MERGE_MSG");
770 if (strbuf_read_file(msg
, filename
, 0) < 0)
771 die_errno(_("Could not read from '%s'"), filename
);
774 static void write_merge_state(struct commit_list
*);
775 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
778 error("%s", err_msg
);
780 _("Not committing merge; use 'git commit' to complete the merge.\n"));
781 write_merge_state(remoteheads
);
785 static const char merge_editor_comment
[] =
786 N_("Please enter a commit message to explain why this merge is necessary,\n"
787 "especially if it merges an updated upstream into a topic branch.\n"
789 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
792 static void prepare_to_commit(struct commit_list
*remoteheads
)
794 struct strbuf msg
= STRBUF_INIT
;
795 strbuf_addbuf(&msg
, &merge_msg
);
796 strbuf_addch(&msg
, '\n');
798 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
799 write_merge_msg(&msg
);
800 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
801 git_path("MERGE_MSG"), "merge", NULL
))
802 abort_commit(remoteheads
, NULL
);
803 if (0 < option_edit
) {
804 if (launch_editor(git_path("MERGE_MSG"), NULL
, NULL
))
805 abort_commit(remoteheads
, NULL
);
807 read_merge_msg(&msg
);
808 stripspace(&msg
, 0 < option_edit
);
810 abort_commit(remoteheads
, _("Empty commit message."));
811 strbuf_release(&merge_msg
);
812 strbuf_addbuf(&merge_msg
, &msg
);
813 strbuf_release(&msg
);
816 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
818 unsigned char result_tree
[20], result_commit
[20];
819 struct commit_list
*parents
, **pptr
= &parents
;
821 write_tree_trivial(result_tree
);
822 printf(_("Wonderful.\n"));
823 pptr
= commit_list_append(head
, pptr
);
824 pptr
= commit_list_append(remoteheads
->item
, pptr
);
825 prepare_to_commit(remoteheads
);
826 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
827 result_commit
, NULL
, sign_commit
))
828 die(_("failed to write commit object"));
829 finish(head
, remoteheads
, result_commit
, "In-index merge");
834 static int finish_automerge(struct commit
*head
,
836 struct commit_list
*common
,
837 struct commit_list
*remoteheads
,
838 unsigned char *result_tree
,
839 const char *wt_strategy
)
841 struct commit_list
*parents
= NULL
;
842 struct strbuf buf
= STRBUF_INIT
;
843 unsigned char result_commit
[20];
845 free_commit_list(common
);
846 parents
= remoteheads
;
847 if (!head_subsumed
|| fast_forward
== FF_NO
)
848 commit_list_insert(head
, &parents
);
849 strbuf_addch(&merge_msg
, '\n');
850 prepare_to_commit(remoteheads
);
851 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
852 result_commit
, NULL
, sign_commit
))
853 die(_("failed to write commit object"));
854 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
855 finish(head
, remoteheads
, result_commit
, buf
.buf
);
856 strbuf_release(&buf
);
861 static int suggest_conflicts(int renormalizing
)
863 const char *filename
;
867 filename
= git_path("MERGE_MSG");
868 fp
= fopen(filename
, "a");
870 die_errno(_("Could not open '%s' for writing"), filename
);
871 fprintf(fp
, "\nConflicts:\n");
872 for (pos
= 0; pos
< active_nr
; pos
++) {
873 const struct cache_entry
*ce
= active_cache
[pos
];
876 fprintf(fp
, "\t%s\n", ce
->name
);
877 while (pos
+ 1 < active_nr
&&
879 active_cache
[pos
+ 1]->name
))
884 rerere(allow_rerere_auto
);
885 printf(_("Automatic merge failed; "
886 "fix conflicts and then commit the result.\n"));
890 static struct commit
*is_old_style_invocation(int argc
, const char **argv
,
891 const unsigned char *head
)
893 struct commit
*second_token
= NULL
;
895 unsigned char second_sha1
[20];
897 if (get_sha1(argv
[1], second_sha1
))
899 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
901 die(_("'%s' is not a commit"), argv
[1]);
902 if (hashcmp(second_token
->object
.sha1
, head
))
908 static int evaluate_result(void)
913 /* Check how many files differ. */
914 init_revisions(&rev
, "");
915 setup_revisions(0, NULL
, &rev
, NULL
);
916 rev
.diffopt
.output_format
|=
917 DIFF_FORMAT_CALLBACK
;
918 rev
.diffopt
.format_callback
= count_diff_files
;
919 rev
.diffopt
.format_callback_data
= &cnt
;
920 run_diff_files(&rev
, 0);
923 * Check how many unmerged entries are
926 cnt
+= count_unmerged_entries();
932 * Pretend as if the user told us to merge with the remote-tracking
933 * branch we have for the upstream of the current branch
935 static int setup_with_upstream(const char ***argv
)
937 struct branch
*branch
= branch_get(NULL
);
942 die(_("No current branch."));
944 die(_("No remote for the current branch."));
945 if (!branch
->merge_nr
)
946 die(_("No default upstream defined for the current branch."));
948 args
= xcalloc(branch
->merge_nr
+ 1, sizeof(char *));
949 for (i
= 0; i
< branch
->merge_nr
; i
++) {
950 if (!branch
->merge
[i
]->dst
)
951 die(_("No remote-tracking branch for %s from %s"),
952 branch
->merge
[i
]->src
, branch
->remote_name
);
953 args
[i
] = branch
->merge
[i
]->dst
;
960 static void write_merge_state(struct commit_list
*remoteheads
)
962 const char *filename
;
964 struct commit_list
*j
;
965 struct strbuf buf
= STRBUF_INIT
;
967 for (j
= remoteheads
; j
; j
= j
->next
) {
968 unsigned const char *sha1
;
969 struct commit
*c
= j
->item
;
970 if (c
->util
&& merge_remote_util(c
)->obj
) {
971 sha1
= merge_remote_util(c
)->obj
->sha1
;
973 sha1
= c
->object
.sha1
;
975 strbuf_addf(&buf
, "%s\n", sha1_to_hex(sha1
));
977 filename
= git_path("MERGE_HEAD");
978 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
980 die_errno(_("Could not open '%s' for writing"), filename
);
981 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
982 die_errno(_("Could not write to '%s'"), filename
);
984 strbuf_addch(&merge_msg
, '\n');
985 write_merge_msg(&merge_msg
);
987 filename
= git_path("MERGE_MODE");
988 fd
= open(filename
, O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
990 die_errno(_("Could not open '%s' for writing"), filename
);
992 if (fast_forward
== FF_NO
)
993 strbuf_addf(&buf
, "no-ff");
994 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
995 die_errno(_("Could not write to '%s'"), filename
);
999 static int default_edit_option(void)
1001 static const char name
[] = "GIT_MERGE_AUTOEDIT";
1002 const char *e
= getenv(name
);
1003 struct stat st_stdin
, st_stdout
;
1006 /* an explicit -m msg without --[no-]edit */
1010 int v
= git_config_maybe_bool(name
, e
);
1012 die("Bad value '%s' in environment '%s'", e
, name
);
1016 /* Use editor if stdin and stdout are the same and is a tty */
1017 return (!fstat(0, &st_stdin
) &&
1018 !fstat(1, &st_stdout
) &&
1019 isatty(0) && isatty(1) &&
1020 st_stdin
.st_dev
== st_stdout
.st_dev
&&
1021 st_stdin
.st_ino
== st_stdout
.st_ino
&&
1022 st_stdin
.st_mode
== st_stdout
.st_mode
);
1025 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
1027 struct commit_list
*remoteheads
)
1029 struct commit_list
*parents
, *next
, **remotes
= &remoteheads
;
1032 * Is the current HEAD reachable from another commit being
1033 * merged? If so we do not want to record it as a parent of
1034 * the resulting merge, unless --no-ff is given. We will flip
1035 * this variable to 0 when we find HEAD among the independent
1036 * tips being merged.
1040 /* Find what parents to record by checking independent ones. */
1041 parents
= reduce_heads(remoteheads
);
1043 for (remoteheads
= NULL
, remotes
= &remoteheads
;
1046 struct commit
*commit
= parents
->item
;
1047 next
= parents
->next
;
1048 if (commit
== head_commit
)
1051 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1057 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
1059 struct fmt_merge_msg_opts opts
;
1061 memset(&opts
, 0, sizeof(opts
));
1062 opts
.add_title
= !have_message
;
1063 opts
.shortlog_len
= shortlog_len
;
1064 opts
.credit_people
= (0 < option_edit
);
1066 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1068 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1071 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1073 const char *filename
;
1075 struct strbuf fetch_head_file
= STRBUF_INIT
;
1078 merge_names
= &fetch_head_file
;
1080 filename
= git_path("FETCH_HEAD");
1081 fd
= open(filename
, O_RDONLY
);
1083 die_errno(_("could not open '%s' for reading"), filename
);
1085 if (strbuf_read(merge_names
, fd
, 0) < 0)
1086 die_errno(_("could not read '%s'"), filename
);
1088 die_errno(_("could not close '%s'"), filename
);
1090 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1091 unsigned char sha1
[20];
1093 struct commit
*commit
;
1095 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1097 npos
= ptr
- merge_names
->buf
+ 1;
1099 npos
= merge_names
->len
;
1101 if (npos
- pos
< 40 + 2 ||
1102 get_sha1_hex(merge_names
->buf
+ pos
, sha1
))
1103 commit
= NULL
; /* bad */
1104 else if (memcmp(merge_names
->buf
+ pos
+ 40, "\t\t", 2))
1105 continue; /* not-for-merge */
1107 char saved
= merge_names
->buf
[pos
+ 40];
1108 merge_names
->buf
[pos
+ 40] = '\0';
1109 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1110 merge_names
->buf
[pos
+ 40] = saved
;
1115 die("not something we can merge in %s: %s",
1116 filename
, merge_names
->buf
+ pos
);
1118 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1121 if (merge_names
== &fetch_head_file
)
1122 strbuf_release(&fetch_head_file
);
1125 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1127 int argc
, const char **argv
,
1128 struct strbuf
*merge_msg
)
1131 struct commit_list
*remoteheads
= NULL
;
1132 struct commit_list
**remotes
= &remoteheads
;
1133 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1135 if (merge_msg
&& (!have_message
|| shortlog_len
))
1136 autogen
= &merge_names
;
1139 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1141 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1142 handle_fetch_head(remotes
, autogen
);
1143 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1145 for (i
= 0; i
< argc
; i
++) {
1146 struct commit
*commit
= get_merge_parent(argv
[i
]);
1148 help_unknown_ref(argv
[i
], "merge",
1149 "not something we can merge");
1150 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1152 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1154 struct commit_list
*p
;
1155 for (p
= remoteheads
; p
; p
= p
->next
)
1156 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1161 prepare_merge_message(autogen
, merge_msg
);
1162 strbuf_release(autogen
);
1168 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1170 unsigned char result_tree
[20];
1171 unsigned char stash
[20];
1172 unsigned char head_sha1
[20];
1173 struct commit
*head_commit
;
1174 struct strbuf buf
= STRBUF_INIT
;
1175 const char *head_arg
;
1176 int flag
, i
, ret
= 0, head_subsumed
;
1177 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1178 struct commit_list
*common
= NULL
;
1179 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1180 struct commit_list
*remoteheads
, *p
;
1181 void *branch_to_free
;
1183 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1184 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1187 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1190 branch
= branch_to_free
= resolve_refdup("HEAD", 0, head_sha1
, &flag
);
1191 if (branch
&& starts_with(branch
, "refs/heads/"))
1193 if (!branch
|| is_null_sha1(head_sha1
))
1196 head_commit
= lookup_commit_or_die(head_sha1
, "HEAD");
1198 git_config(git_merge_config
, NULL
);
1200 if (branch_mergeoptions
)
1201 parse_branch_merge_options(branch_mergeoptions
);
1202 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1203 builtin_merge_usage
, 0);
1204 if (shortlog_len
< 0)
1205 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1207 if (verbosity
< 0 && show_progress
== -1)
1210 if (abort_current_merge
) {
1212 const char *nargv
[] = {"reset", "--merge", NULL
};
1214 if (!file_exists(git_path("MERGE_HEAD")))
1215 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1217 /* Invoke 'git reset --merge' */
1218 ret
= cmd_reset(nargc
, nargv
, prefix
);
1222 if (read_cache_unmerged())
1223 die_resolve_conflict("merge");
1225 if (file_exists(git_path("MERGE_HEAD"))) {
1227 * There is no unmerged entry, don't advise 'git
1228 * add/rm <file>', just 'git commit'.
1230 if (advice_resolve_conflict
)
1231 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1232 "Please, commit your changes before you merge."));
1234 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1236 if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
1237 if (advice_resolve_conflict
)
1238 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1239 "Please, commit your changes before you merge."));
1241 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1243 resolve_undo_clear();
1249 if (fast_forward
== FF_NO
)
1250 die(_("You cannot combine --squash with --no-ff."));
1255 if (default_to_upstream
)
1256 argc
= setup_with_upstream(&argv
);
1258 die(_("No commit specified and merge.defaultToUpstream not set."));
1259 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1264 usage_with_options(builtin_merge_usage
,
1265 builtin_merge_options
);
1268 struct commit
*remote_head
;
1270 * If the merged head is a valid one there is no reason
1271 * to forbid "git merge" into a branch yet to be born.
1272 * We do the same for "git pull".
1275 die(_("Squash commit into empty head not supported yet"));
1276 if (fast_forward
== FF_NO
)
1277 die(_("Non-fast-forward commit does not make sense into "
1279 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1281 remote_head
= remoteheads
->item
;
1283 die(_("%s - not something we can merge"), argv
[0]);
1284 if (remoteheads
->next
)
1285 die(_("Can merge only exactly one commit into empty head"));
1286 read_empty(remote_head
->object
.sha1
, 0);
1287 update_ref("initial pull", "HEAD", remote_head
->object
.sha1
,
1288 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1293 * This could be traditional "merge <msg> HEAD <commit>..." and
1294 * the way we can tell it is to see if the second token is HEAD,
1295 * but some people might have misused the interface and used a
1296 * commit-ish that is the same as HEAD there instead.
1297 * Traditional format never would have "-m" so it is an
1298 * additional safety measure to check for it.
1300 if (!have_message
&&
1301 is_old_style_invocation(argc
, argv
, head_commit
->object
.sha1
)) {
1302 warning("old-style 'git merge <msg> HEAD <commit>' is deprecated.");
1303 strbuf_addstr(&merge_msg
, argv
[0]);
1307 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1310 /* We are invoked directly as the first-class UI. */
1314 * All the rest are the commits being merged; prepare
1315 * the standard merge summary message to be appended
1316 * to the given message.
1318 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1319 argc
, argv
, &merge_msg
);
1322 if (!head_commit
|| !argc
)
1323 usage_with_options(builtin_merge_usage
,
1324 builtin_merge_options
);
1326 if (verify_signatures
) {
1327 for (p
= remoteheads
; p
; p
= p
->next
) {
1328 struct commit
*commit
= p
->item
;
1330 struct signature_check signature_check
;
1331 memset(&signature_check
, 0, sizeof(signature_check
));
1333 check_commit_signature(commit
, &signature_check
);
1335 strcpy(hex
, find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
1336 switch (signature_check
.result
) {
1340 die(_("Commit %s has an untrusted GPG signature, "
1341 "allegedly by %s."), hex
, signature_check
.signer
);
1343 die(_("Commit %s has a bad GPG signature "
1344 "allegedly by %s."), hex
, signature_check
.signer
);
1346 die(_("Commit %s does not have a GPG signature."), hex
);
1348 if (verbosity
>= 0 && signature_check
.result
== 'G')
1349 printf(_("Commit %s has a good GPG signature by %s\n"),
1350 hex
, signature_check
.signer
);
1352 signature_check_clear(&signature_check
);
1356 strbuf_addstr(&buf
, "merge");
1357 for (p
= remoteheads
; p
; p
= p
->next
)
1358 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1359 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1362 for (p
= remoteheads
; p
; p
= p
->next
) {
1363 struct commit
*commit
= p
->item
;
1364 strbuf_addf(&buf
, "GITHEAD_%s",
1365 sha1_to_hex(commit
->object
.sha1
));
1366 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1368 if (fast_forward
!= FF_ONLY
&&
1369 merge_remote_util(commit
) &&
1370 merge_remote_util(commit
)->obj
&&
1371 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1372 fast_forward
= FF_NO
;
1375 if (option_edit
< 0)
1376 option_edit
= default_edit_option();
1378 if (!use_strategies
) {
1380 ; /* already up-to-date */
1381 else if (!remoteheads
->next
)
1382 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1384 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1387 for (i
= 0; i
< use_strategies_nr
; i
++) {
1388 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1389 fast_forward
= FF_NO
;
1390 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1395 ; /* already up-to-date */
1396 else if (!remoteheads
->next
)
1397 common
= get_merge_bases(head_commit
, remoteheads
->item
, 1);
1399 struct commit_list
*list
= remoteheads
;
1400 commit_list_insert(head_commit
, &list
);
1401 common
= get_octopus_merge_bases(list
);
1405 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.sha1
,
1406 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1408 if (remoteheads
&& !common
)
1409 ; /* No common ancestors found. We need a real merge. */
1410 else if (!remoteheads
||
1411 (!remoteheads
->next
&& !common
->next
&&
1412 common
->item
== remoteheads
->item
)) {
1414 * If head can reach all the merge then we are up to date.
1415 * but first the most common case of merging one remote.
1417 finish_up_to_date("Already up-to-date.");
1419 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1421 !hashcmp(common
->item
->object
.sha1
, head_commit
->object
.sha1
)) {
1422 /* Again the most common case of merging one remote. */
1423 struct strbuf msg
= STRBUF_INIT
;
1424 struct commit
*commit
;
1427 strcpy(hex
, find_unique_abbrev(head_commit
->object
.sha1
, DEFAULT_ABBREV
));
1430 printf(_("Updating %s..%s\n"),
1432 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1434 strbuf_addstr(&msg
, "Fast-forward");
1437 " (no commit created; -m option ignored)");
1438 commit
= remoteheads
->item
;
1444 if (checkout_fast_forward(head_commit
->object
.sha1
,
1445 commit
->object
.sha1
,
1446 overwrite_ignore
)) {
1451 finish(head_commit
, remoteheads
, commit
->object
.sha1
, msg
.buf
);
1454 } else if (!remoteheads
->next
&& common
->next
)
1457 * We are not doing octopus and not fast-forward. Need
1460 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1462 * We are not doing octopus, not fast-forward, and have
1465 refresh_cache(REFRESH_QUIET
);
1466 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1467 /* See if it is really trivial. */
1468 git_committer_info(IDENT_STRICT
);
1469 printf(_("Trying really trivial in-index merge...\n"));
1470 if (!read_tree_trivial(common
->item
->object
.sha1
,
1471 head_commit
->object
.sha1
,
1472 remoteheads
->item
->object
.sha1
)) {
1473 ret
= merge_trivial(head_commit
, remoteheads
);
1476 printf(_("Nope.\n"));
1480 * An octopus. If we can reach all the remote we are up
1484 struct commit_list
*j
;
1486 for (j
= remoteheads
; j
; j
= j
->next
) {
1487 struct commit_list
*common_one
;
1490 * Here we *have* to calculate the individual
1491 * merge_bases again, otherwise "git merge HEAD^
1492 * HEAD^^" would be missed.
1494 common_one
= get_merge_bases(head_commit
, j
->item
, 1);
1495 if (hashcmp(common_one
->item
->object
.sha1
,
1496 j
->item
->object
.sha1
)) {
1502 finish_up_to_date("Already up-to-date. Yeeah!");
1507 if (fast_forward
== FF_ONLY
)
1508 die(_("Not possible to fast-forward, aborting."));
1510 /* We are going to make a new commit. */
1511 git_committer_info(IDENT_STRICT
);
1514 * At this point, we need a real merge. No matter what strategy
1515 * we use, it would operate on the index, possibly affecting the
1516 * working tree, and when resolved cleanly, have the desired
1517 * tree in the index -- this means that the index must be in
1518 * sync with the head commit. The strategies are responsible
1521 if (use_strategies_nr
== 1 ||
1523 * Stash away the local changes so that we can try more than one.
1526 hashcpy(stash
, null_sha1
);
1528 for (i
= 0; i
< use_strategies_nr
; i
++) {
1531 printf(_("Rewinding the tree to pristine...\n"));
1532 restore_state(head_commit
->object
.sha1
, stash
);
1534 if (use_strategies_nr
!= 1)
1535 printf(_("Trying merge strategy %s...\n"),
1536 use_strategies
[i
]->name
);
1538 * Remember which strategy left the state in the working
1541 wt_strategy
= use_strategies
[i
]->name
;
1543 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1544 common
, remoteheads
,
1545 head_commit
, head_arg
);
1546 if (!option_commit
&& !ret
) {
1549 * This is necessary here just to avoid writing
1550 * the tree, but later we will *not* exit with
1551 * status code 1 because merge_was_ok is set.
1558 * The backend exits with 1 when conflicts are
1559 * left to be resolved, with 2 when it does not
1560 * handle the given merge at all.
1563 int cnt
= evaluate_result();
1565 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1566 best_strategy
= use_strategies
[i
]->name
;
1576 /* Automerge succeeded. */
1577 write_tree_trivial(result_tree
);
1578 automerge_was_ok
= 1;
1583 * If we have a resulting tree, that means the strategy module
1584 * auto resolved the merge cleanly.
1586 if (automerge_was_ok
) {
1587 ret
= finish_automerge(head_commit
, head_subsumed
,
1588 common
, remoteheads
,
1589 result_tree
, wt_strategy
);
1594 * Pick the result from the best strategy and have the user fix
1597 if (!best_strategy
) {
1598 restore_state(head_commit
->object
.sha1
, stash
);
1599 if (use_strategies_nr
> 1)
1601 _("No merge strategy handled the merge.\n"));
1603 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1604 use_strategies
[0]->name
);
1607 } else if (best_strategy
== wt_strategy
)
1608 ; /* We already have its result in the working tree. */
1610 printf(_("Rewinding the tree to pristine...\n"));
1611 restore_state(head_commit
->object
.sha1
, stash
);
1612 printf(_("Using the %s to prepare resolving by hand.\n"),
1614 try_merge_strategy(best_strategy
, common
, remoteheads
,
1615 head_commit
, head_arg
);
1619 finish(head_commit
, remoteheads
, NULL
, NULL
);
1621 write_merge_state(remoteheads
);
1624 fprintf(stderr
, _("Automatic merge went well; "
1625 "stopped before committing as requested\n"));
1627 ret
= suggest_conflicts(option_renormalize
);
1630 free(branch_to_free
);