4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
10 #include "parse-options.h"
12 #include "run-command.h"
18 #include "unpack-trees.h"
19 #include "cache-tree.h"
26 #include "merge-recursive.h"
27 #include "resolve-undo.h"
29 #include "fmt-merge-msg.h"
30 #include "gpg-interface.h"
32 #define DEFAULT_TWOHEAD (1<<0)
33 #define DEFAULT_OCTOPUS (1<<1)
34 #define NO_FAST_FORWARD (1<<2)
35 #define NO_TRIVIAL (1<<3)
42 static const char * const builtin_merge_usage
[] = {
43 "git merge [options] [<commit>...]",
44 "git merge [options] <msg> HEAD <commit>",
49 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
50 static int option_commit
= 1, allow_fast_forward
= 1;
51 static int fast_forward_only
, option_edit
= -1;
52 static int allow_trivial
= 1, have_message
;
53 static int overwrite_ignore
= 1;
54 static struct strbuf merge_msg
= STRBUF_INIT
;
55 static struct strategy
**use_strategies
;
56 static size_t use_strategies_nr
, use_strategies_alloc
;
57 static const char **xopts
;
58 static size_t xopts_nr
, xopts_alloc
;
59 static const char *branch
;
60 static char *branch_mergeoptions
;
61 static int option_renormalize
;
63 static int allow_rerere_auto
;
64 static int abort_current_merge
;
65 static int show_progress
= -1;
66 static int default_to_upstream
;
67 static const char *sign_commit
;
69 static struct strategy all_strategy
[] = {
70 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
71 { "octopus", DEFAULT_OCTOPUS
},
73 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
74 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
77 static const char *pull_twohead
, *pull_octopus
;
79 static int option_parse_message(const struct option
*opt
,
80 const char *arg
, int unset
)
82 struct strbuf
*buf
= opt
->value
;
85 strbuf_setlen(buf
, 0);
87 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
90 return error(_("switch `m' requires a value"));
94 static struct strategy
*get_strategy(const char *name
)
98 static struct cmdnames main_cmds
, other_cmds
;
104 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
105 if (!strcmp(name
, all_strategy
[i
].name
))
106 return &all_strategy
[i
];
109 struct cmdnames not_strategies
;
112 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
113 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
114 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
116 struct cmdname
*ent
= main_cmds
.names
[i
];
117 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
118 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
119 && !all_strategy
[j
].name
[ent
->len
])
122 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
124 exclude_cmds(&main_cmds
, ¬_strategies
);
126 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
127 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
128 fprintf(stderr
, _("Available strategies are:"));
129 for (i
= 0; i
< main_cmds
.cnt
; i
++)
130 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
131 fprintf(stderr
, ".\n");
132 if (other_cmds
.cnt
) {
133 fprintf(stderr
, _("Available custom strategies are:"));
134 for (i
= 0; i
< other_cmds
.cnt
; i
++)
135 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
136 fprintf(stderr
, ".\n");
141 ret
= xcalloc(1, sizeof(struct strategy
));
142 ret
->name
= xstrdup(name
);
143 ret
->attr
= NO_TRIVIAL
;
147 static void append_strategy(struct strategy
*s
)
149 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
150 use_strategies
[use_strategies_nr
++] = s
;
153 static int option_parse_strategy(const struct option
*opt
,
154 const char *name
, int unset
)
159 append_strategy(get_strategy(name
));
163 static int option_parse_x(const struct option
*opt
,
164 const char *arg
, int unset
)
169 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
170 xopts
[xopts_nr
++] = xstrdup(arg
);
174 static int option_parse_n(const struct option
*opt
,
175 const char *arg
, int unset
)
177 show_diffstat
= unset
;
181 static struct option builtin_merge_options
[] = {
182 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
183 "do not show a diffstat at the end of the merge",
184 PARSE_OPT_NOARG
, option_parse_n
},
185 OPT_BOOLEAN(0, "stat", &show_diffstat
,
186 "show a diffstat at the end of the merge"),
187 OPT_BOOLEAN(0, "summary", &show_diffstat
, "(synonym to --stat)"),
188 { OPTION_INTEGER
, 0, "log", &shortlog_len
, "n",
189 "add (at most <n>) entries from shortlog to merge commit message",
190 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
191 OPT_BOOLEAN(0, "squash", &squash
,
192 "create a single commit instead of doing a merge"),
193 OPT_BOOLEAN(0, "commit", &option_commit
,
194 "perform a commit if the merge succeeds (default)"),
195 OPT_BOOL('e', "edit", &option_edit
,
196 "edit message before committing"),
197 OPT_BOOLEAN(0, "ff", &allow_fast_forward
,
198 "allow fast-forward (default)"),
199 OPT_BOOLEAN(0, "ff-only", &fast_forward_only
,
200 "abort if fast-forward is not possible"),
201 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
202 OPT_CALLBACK('s', "strategy", &use_strategies
, "strategy",
203 "merge strategy to use", option_parse_strategy
),
204 OPT_CALLBACK('X', "strategy-option", &xopts
, "option=value",
205 "option for selected merge strategy", option_parse_x
),
206 OPT_CALLBACK('m', "message", &merge_msg
, "message",
207 "merge commit message (for a non-fast-forward merge)",
208 option_parse_message
),
209 OPT__VERBOSITY(&verbosity
),
210 OPT_BOOLEAN(0, "abort", &abort_current_merge
,
211 "abort the current in-progress merge"),
212 OPT_SET_INT(0, "progress", &show_progress
, "force progress reporting", 1),
213 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, "key id",
214 "GPG sign commit", PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
215 OPT_BOOLEAN(0, "overwrite-ignore", &overwrite_ignore
, "update ignored files (default)"),
219 /* Cleans up metadata that is uninteresting after a succeeded merge. */
220 static void drop_save(void)
222 unlink(git_path("MERGE_HEAD"));
223 unlink(git_path("MERGE_MSG"));
224 unlink(git_path("MERGE_MODE"));
227 static int save_state(unsigned char *stash
)
230 struct child_process cp
;
231 struct strbuf buffer
= STRBUF_INIT
;
232 const char *argv
[] = {"stash", "create", NULL
};
234 memset(&cp
, 0, sizeof(cp
));
239 if (start_command(&cp
))
240 die(_("could not run stash."));
241 len
= strbuf_read(&buffer
, cp
.out
, 1024);
244 if (finish_command(&cp
) || len
< 0)
245 die(_("stash failed"));
246 else if (!len
) /* no changes */
248 strbuf_setlen(&buffer
, buffer
.len
-1);
249 if (get_sha1(buffer
.buf
, stash
))
250 die(_("not a valid object: %s"), buffer
.buf
);
254 static void read_empty(unsigned const char *sha1
, int verbose
)
259 args
[i
++] = "read-tree";
264 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
265 args
[i
++] = sha1_to_hex(sha1
);
268 if (run_command_v_opt(args
, RUN_GIT_CMD
))
269 die(_("read-tree failed"));
272 static void reset_hard(unsigned const char *sha1
, int verbose
)
277 args
[i
++] = "read-tree";
280 args
[i
++] = "--reset";
282 args
[i
++] = sha1_to_hex(sha1
);
285 if (run_command_v_opt(args
, RUN_GIT_CMD
))
286 die(_("read-tree failed"));
289 static void restore_state(const unsigned char *head
,
290 const unsigned char *stash
)
292 struct strbuf sb
= STRBUF_INIT
;
293 const char *args
[] = { "stash", "apply", NULL
, NULL
};
295 if (is_null_sha1(stash
))
300 args
[2] = sha1_to_hex(stash
);
303 * It is OK to ignore error here, for example when there was
304 * nothing to restore.
306 run_command_v_opt(args
, RUN_GIT_CMD
);
309 refresh_cache(REFRESH_QUIET
);
312 /* This is called when no merge was necessary. */
313 static void finish_up_to_date(const char *msg
)
316 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
320 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
323 struct strbuf out
= STRBUF_INIT
;
324 struct commit_list
*j
;
325 const char *filename
;
327 struct pretty_print_context ctx
= {0};
329 printf(_("Squash commit -- not updating HEAD\n"));
330 filename
= git_path("SQUASH_MSG");
331 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
333 die_errno(_("Could not write to '%s'"), filename
);
335 init_revisions(&rev
, NULL
);
336 rev
.ignore_merges
= 1;
337 rev
.commit_format
= CMIT_FMT_MEDIUM
;
339 commit
->object
.flags
|= UNINTERESTING
;
340 add_pending_object(&rev
, &commit
->object
, NULL
);
342 for (j
= remoteheads
; j
; j
= j
->next
)
343 add_pending_object(&rev
, &j
->item
->object
, NULL
);
345 setup_revisions(0, NULL
, &rev
, NULL
);
346 if (prepare_revision_walk(&rev
))
347 die(_("revision walk setup failed"));
349 ctx
.abbrev
= rev
.abbrev
;
350 ctx
.date_mode
= rev
.date_mode
;
351 ctx
.fmt
= rev
.commit_format
;
353 strbuf_addstr(&out
, "Squashed commit of the following:\n");
354 while ((commit
= get_revision(&rev
)) != NULL
) {
355 strbuf_addch(&out
, '\n');
356 strbuf_addf(&out
, "commit %s\n",
357 sha1_to_hex(commit
->object
.sha1
));
358 pretty_print_commit(&ctx
, commit
, &out
);
360 if (write(fd
, out
.buf
, out
.len
) < 0)
361 die_errno(_("Writing SQUASH_MSG"));
363 die_errno(_("Finishing SQUASH_MSG"));
364 strbuf_release(&out
);
367 static void finish(struct commit
*head_commit
,
368 struct commit_list
*remoteheads
,
369 const unsigned char *new_head
, const char *msg
)
371 struct strbuf reflog_message
= STRBUF_INIT
;
372 const unsigned char *head
= head_commit
->object
.sha1
;
375 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
379 strbuf_addf(&reflog_message
, "%s: %s",
380 getenv("GIT_REFLOG_ACTION"), msg
);
383 squash_message(head_commit
, remoteheads
);
385 if (verbosity
>= 0 && !merge_msg
.len
)
386 printf(_("No merge message -- not updating HEAD\n"));
388 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
389 update_ref(reflog_message
.buf
, "HEAD",
393 * We ignore errors in 'gc --auto', since the
394 * user should see them.
396 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
399 if (new_head
&& show_diffstat
) {
400 struct diff_options opts
;
402 opts
.output_format
|=
403 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
404 opts
.detect_rename
= DIFF_DETECT_RENAME
;
405 if (diff_setup_done(&opts
) < 0)
406 die(_("diff_setup_done failed"));
407 diff_tree_sha1(head
, new_head
, "", &opts
);
412 /* Run a post-merge hook */
413 run_hook(NULL
, "post-merge", squash
? "1" : "0", NULL
);
415 strbuf_release(&reflog_message
);
418 /* Get the name for the merge commit's message. */
419 static void merge_name(const char *remote
, struct strbuf
*msg
)
421 struct commit
*remote_head
;
422 unsigned char branch_head
[20];
423 struct strbuf buf
= STRBUF_INIT
;
424 struct strbuf bname
= STRBUF_INIT
;
429 strbuf_branchname(&bname
, remote
);
432 memset(branch_head
, 0, sizeof(branch_head
));
433 remote_head
= get_merge_parent(remote
);
435 die(_("'%s' does not point to a commit"), remote
);
437 if (dwim_ref(remote
, strlen(remote
), branch_head
, &found_ref
) > 0) {
438 if (!prefixcmp(found_ref
, "refs/heads/")) {
439 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
440 sha1_to_hex(branch_head
), remote
);
443 if (!prefixcmp(found_ref
, "refs/tags/")) {
444 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
445 sha1_to_hex(branch_head
), remote
);
448 if (!prefixcmp(found_ref
, "refs/remotes/")) {
449 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
450 sha1_to_hex(branch_head
), remote
);
455 /* See if remote matches <name>^^^.. or <name>~<number> */
456 for (len
= 0, ptr
= remote
+ strlen(remote
);
457 remote
< ptr
&& ptr
[-1] == '^';
464 ptr
= strrchr(remote
, '~');
466 int seen_nonzero
= 0;
469 while (*++ptr
&& isdigit(*ptr
)) {
470 seen_nonzero
|= (*ptr
!= '0');
474 len
= 0; /* not ...~<number> */
475 else if (seen_nonzero
)
478 early
= 1; /* "name~" is "name~1"! */
482 struct strbuf truname
= STRBUF_INIT
;
483 strbuf_addstr(&truname
, "refs/heads/");
484 strbuf_addstr(&truname
, remote
);
485 strbuf_setlen(&truname
, truname
.len
- len
);
486 if (ref_exists(truname
.buf
)) {
488 "%s\t\tbranch '%s'%s of .\n",
489 sha1_to_hex(remote_head
->object
.sha1
),
491 (early
? " (early part)" : ""));
492 strbuf_release(&truname
);
497 if (!strcmp(remote
, "FETCH_HEAD") &&
498 !access(git_path("FETCH_HEAD"), R_OK
)) {
499 const char *filename
;
501 struct strbuf line
= STRBUF_INIT
;
504 filename
= git_path("FETCH_HEAD");
505 fp
= fopen(filename
, "r");
507 die_errno(_("could not open '%s' for reading"),
509 strbuf_getline(&line
, fp
, '\n');
511 ptr
= strstr(line
.buf
, "\tnot-for-merge\t");
513 strbuf_remove(&line
, ptr
-line
.buf
+1, 13);
514 strbuf_addbuf(msg
, &line
);
515 strbuf_release(&line
);
518 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
519 sha1_to_hex(remote_head
->object
.sha1
), remote
);
521 strbuf_release(&buf
);
522 strbuf_release(&bname
);
525 static void parse_branch_merge_options(char *bmo
)
532 argc
= split_cmdline(bmo
, &argv
);
534 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
535 split_cmdline_strerror(argc
));
536 argv
= xrealloc(argv
, sizeof(*argv
) * (argc
+ 2));
537 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
539 argv
[0] = "branch.*.mergeoptions";
540 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
541 builtin_merge_usage
, 0);
545 static int git_merge_config(const char *k
, const char *v
, void *cb
)
549 if (branch
&& !prefixcmp(k
, "branch.") &&
550 !prefixcmp(k
+ 7, branch
) &&
551 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
552 free(branch_mergeoptions
);
553 branch_mergeoptions
= xstrdup(v
);
557 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
558 show_diffstat
= git_config_bool(k
, v
);
559 else if (!strcmp(k
, "pull.twohead"))
560 return git_config_string(&pull_twohead
, k
, v
);
561 else if (!strcmp(k
, "pull.octopus"))
562 return git_config_string(&pull_octopus
, k
, v
);
563 else if (!strcmp(k
, "merge.renormalize"))
564 option_renormalize
= git_config_bool(k
, v
);
565 else if (!strcmp(k
, "merge.ff")) {
566 int boolval
= git_config_maybe_bool(k
, v
);
568 allow_fast_forward
= boolval
;
569 } else if (v
&& !strcmp(v
, "only")) {
570 allow_fast_forward
= 1;
571 fast_forward_only
= 1;
572 } /* do not barf on values from future versions of git */
574 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
575 default_to_upstream
= git_config_bool(k
, v
);
579 status
= fmt_merge_msg_config(k
, v
, cb
);
582 status
= git_gpg_config(k
, v
, NULL
);
585 return git_diff_ui_config(k
, v
, cb
);
588 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
592 struct tree
*trees
[MAX_UNPACK_TREES
];
593 struct tree_desc t
[MAX_UNPACK_TREES
];
594 struct unpack_trees_options opts
;
596 memset(&opts
, 0, sizeof(opts
));
598 opts
.src_index
= &the_index
;
599 opts
.dst_index
= &the_index
;
601 opts
.verbose_update
= 1;
602 opts
.trivial_merges_only
= 1;
604 trees
[nr_trees
] = parse_tree_indirect(common
);
605 if (!trees
[nr_trees
++])
607 trees
[nr_trees
] = parse_tree_indirect(head
);
608 if (!trees
[nr_trees
++])
610 trees
[nr_trees
] = parse_tree_indirect(one
);
611 if (!trees
[nr_trees
++])
613 opts
.fn
= threeway_merge
;
614 cache_tree_free(&active_cache_tree
);
615 for (i
= 0; i
< nr_trees
; i
++) {
616 parse_tree(trees
[i
]);
617 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
619 if (unpack_trees(nr_trees
, t
, &opts
))
624 static void write_tree_trivial(unsigned char *sha1
)
626 if (write_cache_as_tree(sha1
, 0, NULL
))
627 die(_("git write-tree failed to write a tree"));
630 static const char *merge_argument(struct commit
*commit
)
633 return sha1_to_hex(commit
->object
.sha1
);
635 return EMPTY_TREE_SHA1_HEX
;
638 int try_merge_command(const char *strategy
, size_t xopts_nr
,
639 const char **xopts
, struct commit_list
*common
,
640 const char *head_arg
, struct commit_list
*remotes
)
643 int i
= 0, x
= 0, ret
;
644 struct commit_list
*j
;
645 struct strbuf buf
= STRBUF_INIT
;
647 args
= xmalloc((4 + xopts_nr
+ commit_list_count(common
) +
648 commit_list_count(remotes
)) * sizeof(char *));
649 strbuf_addf(&buf
, "merge-%s", strategy
);
651 for (x
= 0; x
< xopts_nr
; x
++) {
652 char *s
= xmalloc(strlen(xopts
[x
])+2+1);
654 strcpy(s
+2, xopts
[x
]);
657 for (j
= common
; j
; j
= j
->next
)
658 args
[i
++] = xstrdup(merge_argument(j
->item
));
660 args
[i
++] = head_arg
;
661 for (j
= remotes
; j
; j
= j
->next
)
662 args
[i
++] = xstrdup(merge_argument(j
->item
));
664 ret
= run_command_v_opt(args
, RUN_GIT_CMD
);
665 strbuf_release(&buf
);
667 for (x
= 0; x
< xopts_nr
; x
++)
668 free((void *)args
[i
++]);
669 for (j
= common
; j
; j
= j
->next
)
670 free((void *)args
[i
++]);
672 for (j
= remotes
; j
; j
= j
->next
)
673 free((void *)args
[i
++]);
676 if (read_cache() < 0)
677 die(_("failed to read the cache"));
678 resolve_undo_clear();
683 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
684 struct commit_list
*remoteheads
,
685 struct commit
*head
, const char *head_arg
)
688 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
690 index_fd
= hold_locked_index(lock
, 1);
691 refresh_cache(REFRESH_QUIET
);
692 if (active_cache_changed
&&
693 (write_cache(index_fd
, active_cache
, active_nr
) ||
694 commit_locked_index(lock
)))
695 return error(_("Unable to write index."));
696 rollback_lock_file(lock
);
698 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
700 struct commit
*result
;
701 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
703 struct commit_list
*reversed
= NULL
;
704 struct merge_options o
;
705 struct commit_list
*j
;
707 if (remoteheads
->next
) {
708 error(_("Not handling anything other than two heads merge."));
712 init_merge_options(&o
);
713 if (!strcmp(strategy
, "subtree"))
714 o
.subtree_shift
= "";
716 o
.renormalize
= option_renormalize
;
717 o
.show_rename_progress
=
718 show_progress
== -1 ? isatty(2) : show_progress
;
720 for (x
= 0; x
< xopts_nr
; x
++)
721 if (parse_merge_opt(&o
, xopts
[x
]))
722 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
724 o
.branch1
= head_arg
;
725 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
727 for (j
= common
; j
; j
= j
->next
)
728 commit_list_insert(j
->item
, &reversed
);
730 index_fd
= hold_locked_index(lock
, 1);
731 clean
= merge_recursive(&o
, head
,
732 remoteheads
->item
, reversed
, &result
);
733 if (active_cache_changed
&&
734 (write_cache(index_fd
, active_cache
, active_nr
) ||
735 commit_locked_index(lock
)))
736 die (_("unable to write %s"), get_index_file());
737 rollback_lock_file(lock
);
738 return clean
? 0 : 1;
740 return try_merge_command(strategy
, xopts_nr
, xopts
,
741 common
, head_arg
, remoteheads
);
745 static void count_diff_files(struct diff_queue_struct
*q
,
746 struct diff_options
*opt
, void *data
)
753 static int count_unmerged_entries(void)
757 for (i
= 0; i
< active_nr
; i
++)
758 if (ce_stage(active_cache
[i
]))
764 int checkout_fast_forward(const unsigned char *head
, const unsigned char *remote
)
766 struct tree
*trees
[MAX_UNPACK_TREES
];
767 struct unpack_trees_options opts
;
768 struct tree_desc t
[MAX_UNPACK_TREES
];
769 int i
, fd
, nr_trees
= 0;
770 struct dir_struct dir
;
771 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
773 refresh_cache(REFRESH_QUIET
);
775 fd
= hold_locked_index(lock_file
, 1);
777 memset(&trees
, 0, sizeof(trees
));
778 memset(&opts
, 0, sizeof(opts
));
779 memset(&t
, 0, sizeof(t
));
780 if (overwrite_ignore
) {
781 memset(&dir
, 0, sizeof(dir
));
782 dir
.flags
|= DIR_SHOW_IGNORED
;
783 setup_standard_excludes(&dir
);
788 opts
.src_index
= &the_index
;
789 opts
.dst_index
= &the_index
;
791 opts
.verbose_update
= 1;
793 opts
.fn
= twoway_merge
;
794 setup_unpack_trees_porcelain(&opts
, "merge");
796 trees
[nr_trees
] = parse_tree_indirect(head
);
797 if (!trees
[nr_trees
++])
799 trees
[nr_trees
] = parse_tree_indirect(remote
);
800 if (!trees
[nr_trees
++])
802 for (i
= 0; i
< nr_trees
; i
++) {
803 parse_tree(trees
[i
]);
804 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
806 if (unpack_trees(nr_trees
, t
, &opts
))
808 if (write_cache(fd
, active_cache
, active_nr
) ||
809 commit_locked_index(lock_file
))
810 die(_("unable to write new index file"));
814 static void split_merge_strategies(const char *string
, struct strategy
**list
,
822 buf
= xstrdup(string
);
827 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
828 (*list
)[(*nr
)++].name
= xstrdup(q
);
833 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
834 (*list
)[(*nr
)++].name
= xstrdup(q
);
840 static void add_strategies(const char *string
, unsigned attr
)
842 struct strategy
*list
= NULL
;
843 int list_alloc
= 0, list_nr
= 0, i
;
845 memset(&list
, 0, sizeof(list
));
846 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
848 for (i
= 0; i
< list_nr
; i
++)
849 append_strategy(get_strategy(list
[i
].name
));
852 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
853 if (all_strategy
[i
].attr
& attr
)
854 append_strategy(&all_strategy
[i
]);
858 static void write_merge_msg(struct strbuf
*msg
)
860 const char *filename
= git_path("MERGE_MSG");
861 int fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
863 die_errno(_("Could not open '%s' for writing"),
865 if (write_in_full(fd
, msg
->buf
, msg
->len
) != msg
->len
)
866 die_errno(_("Could not write to '%s'"), filename
);
870 static void read_merge_msg(struct strbuf
*msg
)
872 const char *filename
= git_path("MERGE_MSG");
874 if (strbuf_read_file(msg
, filename
, 0) < 0)
875 die_errno(_("Could not read from '%s'"), filename
);
878 static void write_merge_state(struct commit_list
*);
879 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
882 error("%s", err_msg
);
884 _("Not committing merge; use 'git commit' to complete the merge.\n"));
885 write_merge_state(remoteheads
);
889 static const char merge_editor_comment
[] =
890 N_("Please enter a commit message to explain why this merge is necessary,\n"
891 "especially if it merges an updated upstream into a topic branch.\n"
893 "Lines starting with '#' will be ignored, and an empty message aborts\n"
896 static void prepare_to_commit(struct commit_list
*remoteheads
)
898 struct strbuf msg
= STRBUF_INIT
;
899 const char *comment
= _(merge_editor_comment
);
900 strbuf_addbuf(&msg
, &merge_msg
);
901 strbuf_addch(&msg
, '\n');
903 strbuf_add_lines(&msg
, "# ", comment
, strlen(comment
));
904 write_merge_msg(&msg
);
905 run_hook(get_index_file(), "prepare-commit-msg",
906 git_path("MERGE_MSG"), "merge", NULL
, NULL
);
908 if (launch_editor(git_path("MERGE_MSG"), NULL
, NULL
))
909 abort_commit(remoteheads
, NULL
);
911 read_merge_msg(&msg
);
912 stripspace(&msg
, option_edit
);
914 abort_commit(remoteheads
, _("Empty commit message."));
915 strbuf_release(&merge_msg
);
916 strbuf_addbuf(&merge_msg
, &msg
);
917 strbuf_release(&msg
);
920 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
922 unsigned char result_tree
[20], result_commit
[20];
923 struct commit_list
*parent
= xmalloc(sizeof(*parent
));
925 write_tree_trivial(result_tree
);
926 printf(_("Wonderful.\n"));
928 parent
->next
= xmalloc(sizeof(*parent
->next
));
929 parent
->next
->item
= remoteheads
->item
;
930 parent
->next
->next
= NULL
;
931 prepare_to_commit(remoteheads
);
932 if (commit_tree(&merge_msg
, result_tree
, parent
, result_commit
, NULL
,
934 die(_("failed to write commit object"));
935 finish(head
, remoteheads
, result_commit
, "In-index merge");
940 static int finish_automerge(struct commit
*head
,
942 struct commit_list
*common
,
943 struct commit_list
*remoteheads
,
944 unsigned char *result_tree
,
945 const char *wt_strategy
)
947 struct commit_list
*parents
= NULL
;
948 struct strbuf buf
= STRBUF_INIT
;
949 unsigned char result_commit
[20];
951 free_commit_list(common
);
952 parents
= remoteheads
;
953 if (!head_subsumed
|| !allow_fast_forward
)
954 commit_list_insert(head
, &parents
);
955 strbuf_addch(&merge_msg
, '\n');
956 prepare_to_commit(remoteheads
);
957 if (commit_tree(&merge_msg
, result_tree
, parents
, result_commit
,
959 die(_("failed to write commit object"));
960 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
961 finish(head
, remoteheads
, result_commit
, buf
.buf
);
962 strbuf_release(&buf
);
967 static int suggest_conflicts(int renormalizing
)
969 const char *filename
;
973 filename
= git_path("MERGE_MSG");
974 fp
= fopen(filename
, "a");
976 die_errno(_("Could not open '%s' for writing"), filename
);
977 fprintf(fp
, "\nConflicts:\n");
978 for (pos
= 0; pos
< active_nr
; pos
++) {
979 struct cache_entry
*ce
= active_cache
[pos
];
982 fprintf(fp
, "\t%s\n", ce
->name
);
983 while (pos
+ 1 < active_nr
&&
985 active_cache
[pos
+ 1]->name
))
990 rerere(allow_rerere_auto
);
991 printf(_("Automatic merge failed; "
992 "fix conflicts and then commit the result.\n"));
996 static struct commit
*is_old_style_invocation(int argc
, const char **argv
,
997 const unsigned char *head
)
999 struct commit
*second_token
= NULL
;
1001 unsigned char second_sha1
[20];
1003 if (get_sha1(argv
[1], second_sha1
))
1005 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
1007 die(_("'%s' is not a commit"), argv
[1]);
1008 if (hashcmp(second_token
->object
.sha1
, head
))
1011 return second_token
;
1014 static int evaluate_result(void)
1017 struct rev_info rev
;
1019 /* Check how many files differ. */
1020 init_revisions(&rev
, "");
1021 setup_revisions(0, NULL
, &rev
, NULL
);
1022 rev
.diffopt
.output_format
|=
1023 DIFF_FORMAT_CALLBACK
;
1024 rev
.diffopt
.format_callback
= count_diff_files
;
1025 rev
.diffopt
.format_callback_data
= &cnt
;
1026 run_diff_files(&rev
, 0);
1029 * Check how many unmerged entries are
1032 cnt
+= count_unmerged_entries();
1038 * Pretend as if the user told us to merge with the tracking
1039 * branch we have for the upstream of the current branch
1041 static int setup_with_upstream(const char ***argv
)
1043 struct branch
*branch
= branch_get(NULL
);
1048 die(_("No current branch."));
1049 if (!branch
->remote
)
1050 die(_("No remote for the current branch."));
1051 if (!branch
->merge_nr
)
1052 die(_("No default upstream defined for the current branch."));
1054 args
= xcalloc(branch
->merge_nr
+ 1, sizeof(char *));
1055 for (i
= 0; i
< branch
->merge_nr
; i
++) {
1056 if (!branch
->merge
[i
]->dst
)
1057 die(_("No remote tracking branch for %s from %s"),
1058 branch
->merge
[i
]->src
, branch
->remote_name
);
1059 args
[i
] = branch
->merge
[i
]->dst
;
1066 static void write_merge_state(struct commit_list
*remoteheads
)
1068 const char *filename
;
1070 struct commit_list
*j
;
1071 struct strbuf buf
= STRBUF_INIT
;
1073 for (j
= remoteheads
; j
; j
= j
->next
) {
1074 unsigned const char *sha1
;
1075 struct commit
*c
= j
->item
;
1076 if (c
->util
&& merge_remote_util(c
)->obj
) {
1077 sha1
= merge_remote_util(c
)->obj
->sha1
;
1079 sha1
= c
->object
.sha1
;
1081 strbuf_addf(&buf
, "%s\n", sha1_to_hex(sha1
));
1083 filename
= git_path("MERGE_HEAD");
1084 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
1086 die_errno(_("Could not open '%s' for writing"), filename
);
1087 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1088 die_errno(_("Could not write to '%s'"), filename
);
1090 strbuf_addch(&merge_msg
, '\n');
1091 write_merge_msg(&merge_msg
);
1093 filename
= git_path("MERGE_MODE");
1094 fd
= open(filename
, O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
1096 die_errno(_("Could not open '%s' for writing"), filename
);
1098 if (!allow_fast_forward
)
1099 strbuf_addf(&buf
, "no-ff");
1100 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1101 die_errno(_("Could not write to '%s'"), filename
);
1105 static int default_edit_option(void)
1107 static const char name
[] = "GIT_MERGE_AUTOEDIT";
1108 const char *e
= getenv(name
);
1109 struct stat st_stdin
, st_stdout
;
1112 /* an explicit -m msg without --[no-]edit */
1116 int v
= git_config_maybe_bool(name
, e
);
1118 die("Bad value '%s' in environment '%s'", e
, name
);
1122 /* Use editor if stdin and stdout are the same and is a tty */
1123 return (!fstat(0, &st_stdin
) &&
1124 !fstat(1, &st_stdout
) &&
1125 isatty(0) && isatty(1) &&
1126 st_stdin
.st_dev
== st_stdout
.st_dev
&&
1127 st_stdin
.st_ino
== st_stdout
.st_ino
&&
1128 st_stdin
.st_mode
== st_stdout
.st_mode
);
1131 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1133 int argc
, const char **argv
)
1136 struct commit_list
*remoteheads
= NULL
, *parents
, *next
;
1137 struct commit_list
**remotes
= &remoteheads
;
1140 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1141 for (i
= 0; i
< argc
; i
++) {
1142 struct commit
*commit
= get_merge_parent(argv
[i
]);
1144 die(_("%s - not something we can merge"), argv
[i
]);
1145 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1149 parents
= reduce_heads(remoteheads
);
1151 *head_subsumed
= 1; /* we will flip this to 0 when we find it */
1152 for (remoteheads
= NULL
, remotes
= &remoteheads
;
1155 struct commit
*commit
= parents
->item
;
1156 next
= parents
->next
;
1157 if (commit
== head_commit
)
1160 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1165 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1167 unsigned char result_tree
[20];
1168 unsigned char stash
[20];
1169 unsigned char head_sha1
[20];
1170 struct commit
*head_commit
;
1171 struct strbuf buf
= STRBUF_INIT
;
1172 const char *head_arg
;
1173 int flag
, i
, ret
= 0, head_subsumed
;
1174 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1175 struct commit_list
*common
= NULL
;
1176 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1177 struct commit_list
*remoteheads
, *p
;
1178 void *branch_to_free
;
1180 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1181 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1184 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1187 branch
= branch_to_free
= resolve_refdup("HEAD", head_sha1
, 0, &flag
);
1188 if (branch
&& !prefixcmp(branch
, "refs/heads/"))
1190 if (!branch
|| is_null_sha1(head_sha1
))
1193 head_commit
= lookup_commit_or_die(head_sha1
, "HEAD");
1195 git_config(git_merge_config
, NULL
);
1197 if (branch_mergeoptions
)
1198 parse_branch_merge_options(branch_mergeoptions
);
1199 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1200 builtin_merge_usage
, 0);
1201 if (shortlog_len
< 0)
1202 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1204 if (verbosity
< 0 && show_progress
== -1)
1207 if (abort_current_merge
) {
1209 const char *nargv
[] = {"reset", "--merge", NULL
};
1211 if (!file_exists(git_path("MERGE_HEAD")))
1212 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1214 /* Invoke 'git reset --merge' */
1215 ret
= cmd_reset(nargc
, nargv
, prefix
);
1219 if (read_cache_unmerged())
1220 die_resolve_conflict("merge");
1222 if (file_exists(git_path("MERGE_HEAD"))) {
1224 * There is no unmerged entry, don't advise 'git
1225 * add/rm <file>', just 'git commit'.
1227 if (advice_resolve_conflict
)
1228 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1229 "Please, commit your changes before you can merge."));
1231 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1233 if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
1234 if (advice_resolve_conflict
)
1235 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1236 "Please, commit your changes before you can merge."));
1238 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1240 resolve_undo_clear();
1246 if (!allow_fast_forward
)
1247 die(_("You cannot combine --squash with --no-ff."));
1251 if (!allow_fast_forward
&& fast_forward_only
)
1252 die(_("You cannot combine --no-ff with --ff-only."));
1254 if (!abort_current_merge
) {
1256 if (default_to_upstream
)
1257 argc
= setup_with_upstream(&argv
);
1259 die(_("No commit specified and merge.defaultToUpstream not set."));
1260 } else if (argc
== 1 && !strcmp(argv
[0], "-"))
1264 usage_with_options(builtin_merge_usage
,
1265 builtin_merge_options
);
1268 * This could be traditional "merge <msg> HEAD <commit>..." and
1269 * the way we can tell it is to see if the second token is HEAD,
1270 * but some people might have misused the interface and used a
1271 * committish that is the same as HEAD there instead.
1272 * Traditional format never would have "-m" so it is an
1273 * additional safety measure to check for it.
1276 if (!have_message
&& head_commit
&&
1277 is_old_style_invocation(argc
, argv
, head_commit
->object
.sha1
)) {
1278 strbuf_addstr(&merge_msg
, argv
[0]);
1282 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1283 } else if (!head_commit
) {
1284 struct commit
*remote_head
;
1286 * If the merged head is a valid one there is no reason
1287 * to forbid "git merge" into a branch yet to be born.
1288 * We do the same for "git pull".
1291 die(_("Can merge only exactly one commit into "
1294 die(_("Squash commit into empty head not supported yet"));
1295 if (!allow_fast_forward
)
1296 die(_("Non-fast-forward commit does not make sense into "
1298 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1299 remote_head
= remoteheads
->item
;
1301 die(_("%s - not something we can merge"), argv
[0]);
1302 read_empty(remote_head
->object
.sha1
, 0);
1303 update_ref("initial pull", "HEAD", remote_head
->object
.sha1
,
1304 NULL
, 0, DIE_ON_ERR
);
1307 struct strbuf merge_names
= STRBUF_INIT
;
1309 /* We are invoked directly as the first-class UI. */
1313 * All the rest are the commits being merged; prepare
1314 * the standard merge summary message to be appended
1315 * to the given message.
1317 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1318 for (p
= remoteheads
; p
; p
= p
->next
)
1319 merge_name(merge_remote_util(p
->item
)->name
, &merge_names
);
1321 if (!have_message
|| shortlog_len
) {
1322 struct fmt_merge_msg_opts opts
;
1323 memset(&opts
, 0, sizeof(opts
));
1324 opts
.add_title
= !have_message
;
1325 opts
.shortlog_len
= shortlog_len
;
1327 fmt_merge_msg(&merge_names
, &merge_msg
, &opts
);
1329 strbuf_setlen(&merge_msg
, merge_msg
.len
- 1);
1333 if (!head_commit
|| !argc
)
1334 usage_with_options(builtin_merge_usage
,
1335 builtin_merge_options
);
1337 strbuf_addstr(&buf
, "merge");
1338 for (p
= remoteheads
; p
; p
= p
->next
)
1339 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1340 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1343 for (p
= remoteheads
; p
; p
= p
->next
) {
1344 struct commit
*commit
= p
->item
;
1345 strbuf_addf(&buf
, "GITHEAD_%s",
1346 sha1_to_hex(commit
->object
.sha1
));
1347 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1349 if (!fast_forward_only
&&
1350 merge_remote_util(commit
) &&
1351 merge_remote_util(commit
)->obj
&&
1352 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
) {
1353 if (option_edit
< 0)
1354 option_edit
= default_edit_option();
1355 allow_fast_forward
= 0;
1359 if (option_edit
< 0)
1362 if (!use_strategies
) {
1364 ; /* already up-to-date */
1365 else if (!remoteheads
->next
)
1366 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1368 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1371 for (i
= 0; i
< use_strategies_nr
; i
++) {
1372 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1373 allow_fast_forward
= 0;
1374 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1379 ; /* already up-to-date */
1380 else if (!remoteheads
->next
)
1381 common
= get_merge_bases(head_commit
, remoteheads
->item
, 1);
1383 struct commit_list
*list
= remoteheads
;
1384 commit_list_insert(head_commit
, &list
);
1385 common
= get_octopus_merge_bases(list
);
1389 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.sha1
,
1390 NULL
, 0, DIE_ON_ERR
);
1392 if (remoteheads
&& !common
)
1393 ; /* No common ancestors found. We need a real merge. */
1394 else if (!remoteheads
||
1395 (!remoteheads
->next
&& !common
->next
&&
1396 common
->item
== remoteheads
->item
)) {
1398 * If head can reach all the merge then we are up to date.
1399 * but first the most common case of merging one remote.
1401 finish_up_to_date("Already up-to-date.");
1403 } else if (allow_fast_forward
&& !remoteheads
->next
&&
1405 !hashcmp(common
->item
->object
.sha1
, head_commit
->object
.sha1
)) {
1406 /* Again the most common case of merging one remote. */
1407 struct strbuf msg
= STRBUF_INIT
;
1408 struct commit
*commit
;
1411 strcpy(hex
, find_unique_abbrev(head_commit
->object
.sha1
, DEFAULT_ABBREV
));
1414 printf(_("Updating %s..%s\n"),
1416 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1418 strbuf_addstr(&msg
, "Fast-forward");
1421 " (no commit created; -m option ignored)");
1422 commit
= remoteheads
->item
;
1428 if (checkout_fast_forward(head_commit
->object
.sha1
,
1429 commit
->object
.sha1
)) {
1434 finish(head_commit
, remoteheads
, commit
->object
.sha1
, msg
.buf
);
1437 } else if (!remoteheads
->next
&& common
->next
)
1440 * We are not doing octopus and not fast-forward. Need
1443 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1445 * We are not doing octopus, not fast-forward, and have
1448 refresh_cache(REFRESH_QUIET
);
1449 if (allow_trivial
&& !fast_forward_only
) {
1450 /* See if it is really trivial. */
1451 git_committer_info(IDENT_ERROR_ON_NO_NAME
);
1452 printf(_("Trying really trivial in-index merge...\n"));
1453 if (!read_tree_trivial(common
->item
->object
.sha1
,
1454 head_commit
->object
.sha1
,
1455 remoteheads
->item
->object
.sha1
)) {
1456 ret
= merge_trivial(head_commit
, remoteheads
);
1459 printf(_("Nope.\n"));
1463 * An octopus. If we can reach all the remote we are up
1467 struct commit_list
*j
;
1469 for (j
= remoteheads
; j
; j
= j
->next
) {
1470 struct commit_list
*common_one
;
1473 * Here we *have* to calculate the individual
1474 * merge_bases again, otherwise "git merge HEAD^
1475 * HEAD^^" would be missed.
1477 common_one
= get_merge_bases(head_commit
, j
->item
, 1);
1478 if (hashcmp(common_one
->item
->object
.sha1
,
1479 j
->item
->object
.sha1
)) {
1485 finish_up_to_date("Already up-to-date. Yeeah!");
1490 if (fast_forward_only
)
1491 die(_("Not possible to fast-forward, aborting."));
1493 /* We are going to make a new commit. */
1494 git_committer_info(IDENT_ERROR_ON_NO_NAME
);
1497 * At this point, we need a real merge. No matter what strategy
1498 * we use, it would operate on the index, possibly affecting the
1499 * working tree, and when resolved cleanly, have the desired
1500 * tree in the index -- this means that the index must be in
1501 * sync with the head commit. The strategies are responsible
1504 if (use_strategies_nr
== 1 ||
1506 * Stash away the local changes so that we can try more than one.
1509 hashcpy(stash
, null_sha1
);
1511 for (i
= 0; i
< use_strategies_nr
; i
++) {
1514 printf(_("Rewinding the tree to pristine...\n"));
1515 restore_state(head_commit
->object
.sha1
, stash
);
1517 if (use_strategies_nr
!= 1)
1518 printf(_("Trying merge strategy %s...\n"),
1519 use_strategies
[i
]->name
);
1521 * Remember which strategy left the state in the working
1524 wt_strategy
= use_strategies
[i
]->name
;
1526 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1527 common
, remoteheads
,
1528 head_commit
, head_arg
);
1529 if (!option_commit
&& !ret
) {
1532 * This is necessary here just to avoid writing
1533 * the tree, but later we will *not* exit with
1534 * status code 1 because merge_was_ok is set.
1541 * The backend exits with 1 when conflicts are
1542 * left to be resolved, with 2 when it does not
1543 * handle the given merge at all.
1546 int cnt
= evaluate_result();
1548 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1549 best_strategy
= use_strategies
[i
]->name
;
1559 /* Automerge succeeded. */
1560 write_tree_trivial(result_tree
);
1561 automerge_was_ok
= 1;
1566 * If we have a resulting tree, that means the strategy module
1567 * auto resolved the merge cleanly.
1569 if (automerge_was_ok
) {
1570 ret
= finish_automerge(head_commit
, head_subsumed
,
1571 common
, remoteheads
,
1572 result_tree
, wt_strategy
);
1577 * Pick the result from the best strategy and have the user fix
1580 if (!best_strategy
) {
1581 restore_state(head_commit
->object
.sha1
, stash
);
1582 if (use_strategies_nr
> 1)
1584 _("No merge strategy handled the merge.\n"));
1586 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1587 use_strategies
[0]->name
);
1590 } else if (best_strategy
== wt_strategy
)
1591 ; /* We already have its result in the working tree. */
1593 printf(_("Rewinding the tree to pristine...\n"));
1594 restore_state(head_commit
->object
.sha1
, stash
);
1595 printf(_("Using the %s to prepare resolving by hand.\n"),
1597 try_merge_strategy(best_strategy
, common
, remoteheads
,
1598 head_commit
, head_arg
);
1602 finish(head_commit
, remoteheads
, NULL
, NULL
);
1604 write_merge_state(remoteheads
);
1607 fprintf(stderr
, _("Automatic merge went well; "
1608 "stopped before committing as requested\n"));
1610 ret
= suggest_conflicts(option_renormalize
);
1613 free(branch_to_free
);