4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
11 #include "parse-options.h"
14 #include "run-command.h"
21 #include "unpack-trees.h"
22 #include "cache-tree.h"
29 #include "merge-recursive.h"
30 #include "resolve-undo.h"
32 #include "fmt-merge-msg.h"
33 #include "gpg-interface.h"
34 #include "sequencer.h"
35 #include "string-list.h"
39 #include "commit-reach.h"
41 #define DEFAULT_TWOHEAD (1<<0)
42 #define DEFAULT_OCTOPUS (1<<1)
43 #define NO_FAST_FORWARD (1<<2)
44 #define NO_TRIVIAL (1<<3)
51 static const char * const builtin_merge_usage
[] = {
52 N_("git merge [<options>] [<commit>...]"),
53 N_("git merge --abort"),
54 N_("git merge --continue"),
58 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
59 static int option_commit
= 1;
60 static int option_edit
= -1;
61 static int allow_trivial
= 1, have_message
, verify_signatures
;
62 static int overwrite_ignore
= 1;
63 static struct strbuf merge_msg
= STRBUF_INIT
;
64 static struct strategy
**use_strategies
;
65 static size_t use_strategies_nr
, use_strategies_alloc
;
66 static const char **xopts
;
67 static size_t xopts_nr
, xopts_alloc
;
68 static const char *branch
;
69 static char *branch_mergeoptions
;
70 static int option_renormalize
;
72 static int allow_rerere_auto
;
73 static int abort_current_merge
;
74 static int continue_current_merge
;
75 static int allow_unrelated_histories
;
76 static int show_progress
= -1;
77 static int default_to_upstream
= 1;
79 static const char *sign_commit
;
80 static int verify_msg
= 1;
82 static struct strategy all_strategy
[] = {
83 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
84 { "octopus", DEFAULT_OCTOPUS
},
86 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
87 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
90 static const char *pull_twohead
, *pull_octopus
;
98 static enum ff_type fast_forward
= FF_ALLOW
;
100 static int option_parse_message(const struct option
*opt
,
101 const char *arg
, int unset
)
103 struct strbuf
*buf
= opt
->value
;
106 strbuf_setlen(buf
, 0);
108 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
111 return error(_("switch `m' requires a value"));
115 static struct strategy
*get_strategy(const char *name
)
118 struct strategy
*ret
;
119 static struct cmdnames main_cmds
, other_cmds
;
125 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
126 if (!strcmp(name
, all_strategy
[i
].name
))
127 return &all_strategy
[i
];
130 struct cmdnames not_strategies
;
133 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
134 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
135 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
137 struct cmdname
*ent
= main_cmds
.names
[i
];
138 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
139 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
140 && !all_strategy
[j
].name
[ent
->len
])
143 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
145 exclude_cmds(&main_cmds
, ¬_strategies
);
147 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
148 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
149 fprintf(stderr
, _("Available strategies are:"));
150 for (i
= 0; i
< main_cmds
.cnt
; i
++)
151 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
152 fprintf(stderr
, ".\n");
153 if (other_cmds
.cnt
) {
154 fprintf(stderr
, _("Available custom strategies are:"));
155 for (i
= 0; i
< other_cmds
.cnt
; i
++)
156 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
157 fprintf(stderr
, ".\n");
162 ret
= xcalloc(1, sizeof(struct strategy
));
163 ret
->name
= xstrdup(name
);
164 ret
->attr
= NO_TRIVIAL
;
168 static void append_strategy(struct strategy
*s
)
170 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
171 use_strategies
[use_strategies_nr
++] = s
;
174 static int option_parse_strategy(const struct option
*opt
,
175 const char *name
, int unset
)
180 append_strategy(get_strategy(name
));
184 static int option_parse_x(const struct option
*opt
,
185 const char *arg
, int unset
)
190 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
191 xopts
[xopts_nr
++] = xstrdup(arg
);
195 static int option_parse_n(const struct option
*opt
,
196 const char *arg
, int unset
)
198 show_diffstat
= unset
;
202 static struct option builtin_merge_options
[] = {
203 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
204 N_("do not show a diffstat at the end of the merge"),
205 PARSE_OPT_NOARG
, option_parse_n
},
206 OPT_BOOL(0, "stat", &show_diffstat
,
207 N_("show a diffstat at the end of the merge")),
208 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
209 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
210 N_("add (at most <n>) entries from shortlog to merge commit message"),
211 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
212 OPT_BOOL(0, "squash", &squash
,
213 N_("create a single commit instead of doing a merge")),
214 OPT_BOOL(0, "commit", &option_commit
,
215 N_("perform a commit if the merge succeeds (default)")),
216 OPT_BOOL('e', "edit", &option_edit
,
217 N_("edit message before committing")),
218 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
219 OPT_SET_INT_F(0, "ff-only", &fast_forward
,
220 N_("abort if fast-forward is not possible"),
221 FF_ONLY
, PARSE_OPT_NONEG
),
222 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
223 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
224 N_("verify that the named commit has a valid GPG signature")),
225 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
226 N_("merge strategy to use"), option_parse_strategy
),
227 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
228 N_("option for selected merge strategy"), option_parse_x
),
229 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
230 N_("merge commit message (for a non-fast-forward merge)"),
231 option_parse_message
),
232 OPT__VERBOSITY(&verbosity
),
233 OPT_BOOL(0, "abort", &abort_current_merge
,
234 N_("abort the current in-progress merge")),
235 OPT_BOOL(0, "continue", &continue_current_merge
,
236 N_("continue the current in-progress merge")),
237 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories
,
238 N_("allow merging unrelated histories")),
239 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
240 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
241 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
242 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
243 OPT_BOOL(0, "signoff", &signoff
, N_("add Signed-off-by:")),
244 OPT_BOOL(0, "verify", &verify_msg
, N_("verify commit-msg hook")),
248 /* Cleans up metadata that is uninteresting after a succeeded merge. */
249 static void drop_save(void)
251 unlink(git_path_merge_head(the_repository
));
252 unlink(git_path_merge_msg(the_repository
));
253 unlink(git_path_merge_mode(the_repository
));
256 static int save_state(struct object_id
*stash
)
259 struct child_process cp
= CHILD_PROCESS_INIT
;
260 struct strbuf buffer
= STRBUF_INIT
;
261 const char *argv
[] = {"stash", "create", NULL
};
268 if (start_command(&cp
))
269 die(_("could not run stash."));
270 len
= strbuf_read(&buffer
, cp
.out
, 1024);
273 if (finish_command(&cp
) || len
< 0)
274 die(_("stash failed"));
275 else if (!len
) /* no changes */
277 strbuf_setlen(&buffer
, buffer
.len
-1);
278 if (get_oid(buffer
.buf
, stash
))
279 die(_("not a valid object: %s"), buffer
.buf
);
282 strbuf_release(&buffer
);
286 static void read_empty(const struct object_id
*oid
, int verbose
)
291 args
[i
++] = "read-tree";
296 args
[i
++] = empty_tree_oid_hex();
297 args
[i
++] = oid_to_hex(oid
);
300 if (run_command_v_opt(args
, RUN_GIT_CMD
))
301 die(_("read-tree failed"));
304 static void reset_hard(const struct object_id
*oid
, int verbose
)
309 args
[i
++] = "read-tree";
312 args
[i
++] = "--reset";
314 args
[i
++] = oid_to_hex(oid
);
317 if (run_command_v_opt(args
, RUN_GIT_CMD
))
318 die(_("read-tree failed"));
321 static void restore_state(const struct object_id
*head
,
322 const struct object_id
*stash
)
324 struct strbuf sb
= STRBUF_INIT
;
325 const char *args
[] = { "stash", "apply", NULL
, NULL
};
327 if (is_null_oid(stash
))
332 args
[2] = oid_to_hex(stash
);
335 * It is OK to ignore error here, for example when there was
336 * nothing to restore.
338 run_command_v_opt(args
, RUN_GIT_CMD
);
341 refresh_cache(REFRESH_QUIET
);
344 /* This is called when no merge was necessary. */
345 static void finish_up_to_date(const char *msg
)
348 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
352 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
355 struct strbuf out
= STRBUF_INIT
;
356 struct commit_list
*j
;
357 struct pretty_print_context ctx
= {0};
359 printf(_("Squash commit -- not updating HEAD\n"));
361 init_revisions(&rev
, NULL
);
362 rev
.ignore_merges
= 1;
363 rev
.commit_format
= CMIT_FMT_MEDIUM
;
365 commit
->object
.flags
|= UNINTERESTING
;
366 add_pending_object(&rev
, &commit
->object
, NULL
);
368 for (j
= remoteheads
; j
; j
= j
->next
)
369 add_pending_object(&rev
, &j
->item
->object
, NULL
);
371 setup_revisions(0, NULL
, &rev
, NULL
);
372 if (prepare_revision_walk(&rev
))
373 die(_("revision walk setup failed"));
375 ctx
.abbrev
= rev
.abbrev
;
376 ctx
.date_mode
= rev
.date_mode
;
377 ctx
.fmt
= rev
.commit_format
;
379 strbuf_addstr(&out
, "Squashed commit of the following:\n");
380 while ((commit
= get_revision(&rev
)) != NULL
) {
381 strbuf_addch(&out
, '\n');
382 strbuf_addf(&out
, "commit %s\n",
383 oid_to_hex(&commit
->object
.oid
));
384 pretty_print_commit(&ctx
, commit
, &out
);
386 write_file_buf(git_path_squash_msg(the_repository
), out
.buf
, out
.len
);
387 strbuf_release(&out
);
390 static void finish(struct commit
*head_commit
,
391 struct commit_list
*remoteheads
,
392 const struct object_id
*new_head
, const char *msg
)
394 struct strbuf reflog_message
= STRBUF_INIT
;
395 const struct object_id
*head
= &head_commit
->object
.oid
;
398 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
402 strbuf_addf(&reflog_message
, "%s: %s",
403 getenv("GIT_REFLOG_ACTION"), msg
);
406 squash_message(head_commit
, remoteheads
);
408 if (verbosity
>= 0 && !merge_msg
.len
)
409 printf(_("No merge message -- not updating HEAD\n"));
411 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
412 update_ref(reflog_message
.buf
, "HEAD", new_head
, head
,
413 0, UPDATE_REFS_DIE_ON_ERR
);
415 * We ignore errors in 'gc --auto', since the
416 * user should see them.
418 close_all_packs(the_repository
->objects
);
419 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
422 if (new_head
&& show_diffstat
) {
423 struct diff_options opts
;
425 opts
.stat_width
= -1; /* use full terminal width */
426 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
427 opts
.output_format
|=
428 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
429 opts
.detect_rename
= DIFF_DETECT_RENAME
;
430 diff_setup_done(&opts
);
431 diff_tree_oid(head
, new_head
, "", &opts
);
436 /* Run a post-merge hook */
437 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
439 strbuf_release(&reflog_message
);
442 /* Get the name for the merge commit's message. */
443 static void merge_name(const char *remote
, struct strbuf
*msg
)
445 struct commit
*remote_head
;
446 struct object_id branch_head
;
447 struct strbuf buf
= STRBUF_INIT
;
448 struct strbuf bname
= STRBUF_INIT
;
449 struct merge_remote_desc
*desc
;
454 strbuf_branchname(&bname
, remote
, 0);
457 oidclr(&branch_head
);
458 remote_head
= get_merge_parent(remote
);
460 die(_("'%s' does not point to a commit"), remote
);
462 if (dwim_ref(remote
, strlen(remote
), &branch_head
, &found_ref
) > 0) {
463 if (starts_with(found_ref
, "refs/heads/")) {
464 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
465 oid_to_hex(&branch_head
), remote
);
468 if (starts_with(found_ref
, "refs/tags/")) {
469 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
470 oid_to_hex(&branch_head
), remote
);
473 if (starts_with(found_ref
, "refs/remotes/")) {
474 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
475 oid_to_hex(&branch_head
), remote
);
480 /* See if remote matches <name>^^^.. or <name>~<number> */
481 for (len
= 0, ptr
= remote
+ strlen(remote
);
482 remote
< ptr
&& ptr
[-1] == '^';
489 ptr
= strrchr(remote
, '~');
491 int seen_nonzero
= 0;
494 while (*++ptr
&& isdigit(*ptr
)) {
495 seen_nonzero
|= (*ptr
!= '0');
499 len
= 0; /* not ...~<number> */
500 else if (seen_nonzero
)
503 early
= 1; /* "name~" is "name~1"! */
507 struct strbuf truname
= STRBUF_INIT
;
508 strbuf_addf(&truname
, "refs/heads/%s", remote
);
509 strbuf_setlen(&truname
, truname
.len
- len
);
510 if (ref_exists(truname
.buf
)) {
512 "%s\t\tbranch '%s'%s of .\n",
513 oid_to_hex(&remote_head
->object
.oid
),
515 (early
? " (early part)" : ""));
516 strbuf_release(&truname
);
519 strbuf_release(&truname
);
522 desc
= merge_remote_util(remote_head
);
523 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
524 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
525 oid_to_hex(&desc
->obj
->oid
),
526 type_name(desc
->obj
->type
),
531 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
532 oid_to_hex(&remote_head
->object
.oid
), remote
);
534 strbuf_release(&buf
);
535 strbuf_release(&bname
);
538 static void parse_branch_merge_options(char *bmo
)
545 argc
= split_cmdline(bmo
, &argv
);
547 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
548 split_cmdline_strerror(argc
));
549 REALLOC_ARRAY(argv
, argc
+ 2);
550 MOVE_ARRAY(argv
+ 1, argv
, argc
+ 1);
552 argv
[0] = "branch.*.mergeoptions";
553 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
554 builtin_merge_usage
, 0);
558 static int git_merge_config(const char *k
, const char *v
, void *cb
)
562 if (branch
&& starts_with(k
, "branch.") &&
563 starts_with(k
+ 7, branch
) &&
564 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
565 free(branch_mergeoptions
);
566 branch_mergeoptions
= xstrdup(v
);
570 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
571 show_diffstat
= git_config_bool(k
, v
);
572 else if (!strcmp(k
, "merge.verifysignatures"))
573 verify_signatures
= git_config_bool(k
, v
);
574 else if (!strcmp(k
, "pull.twohead"))
575 return git_config_string(&pull_twohead
, k
, v
);
576 else if (!strcmp(k
, "pull.octopus"))
577 return git_config_string(&pull_octopus
, k
, v
);
578 else if (!strcmp(k
, "merge.renormalize"))
579 option_renormalize
= git_config_bool(k
, v
);
580 else if (!strcmp(k
, "merge.ff")) {
581 int boolval
= git_parse_maybe_bool(v
);
583 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
584 } else if (v
&& !strcmp(v
, "only")) {
585 fast_forward
= FF_ONLY
;
586 } /* do not barf on values from future versions of git */
588 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
589 default_to_upstream
= git_config_bool(k
, v
);
591 } else if (!strcmp(k
, "commit.gpgsign")) {
592 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
596 status
= fmt_merge_msg_config(k
, v
, cb
);
599 status
= git_gpg_config(k
, v
, NULL
);
602 return git_diff_ui_config(k
, v
, cb
);
605 static int read_tree_trivial(struct object_id
*common
, struct object_id
*head
,
606 struct object_id
*one
)
609 struct tree
*trees
[MAX_UNPACK_TREES
];
610 struct tree_desc t
[MAX_UNPACK_TREES
];
611 struct unpack_trees_options opts
;
613 memset(&opts
, 0, sizeof(opts
));
615 opts
.src_index
= &the_index
;
616 opts
.dst_index
= &the_index
;
618 opts
.verbose_update
= 1;
619 opts
.trivial_merges_only
= 1;
621 trees
[nr_trees
] = parse_tree_indirect(common
);
622 if (!trees
[nr_trees
++])
624 trees
[nr_trees
] = parse_tree_indirect(head
);
625 if (!trees
[nr_trees
++])
627 trees
[nr_trees
] = parse_tree_indirect(one
);
628 if (!trees
[nr_trees
++])
630 opts
.fn
= threeway_merge
;
631 cache_tree_free(&active_cache_tree
);
632 for (i
= 0; i
< nr_trees
; i
++) {
633 parse_tree(trees
[i
]);
634 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
636 if (unpack_trees(nr_trees
, t
, &opts
))
641 static void write_tree_trivial(struct object_id
*oid
)
643 if (write_cache_as_tree(oid
, 0, NULL
))
644 die(_("git write-tree failed to write a tree"));
647 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
648 struct commit_list
*remoteheads
,
651 struct lock_file lock
= LOCK_INIT
;
652 const char *head_arg
= "HEAD";
654 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
655 refresh_cache(REFRESH_QUIET
);
656 if (write_locked_index(&the_index
, &lock
,
657 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
658 return error(_("Unable to write index."));
660 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
662 struct commit
*result
;
663 struct commit_list
*reversed
= NULL
;
664 struct merge_options o
;
665 struct commit_list
*j
;
667 if (remoteheads
->next
) {
668 error(_("Not handling anything other than two heads merge."));
672 init_merge_options(&o
);
673 if (!strcmp(strategy
, "subtree"))
674 o
.subtree_shift
= "";
676 o
.renormalize
= option_renormalize
;
677 o
.show_rename_progress
=
678 show_progress
== -1 ? isatty(2) : show_progress
;
680 for (x
= 0; x
< xopts_nr
; x
++)
681 if (parse_merge_opt(&o
, xopts
[x
]))
682 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
684 o
.branch1
= head_arg
;
685 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
687 for (j
= common
; j
; j
= j
->next
)
688 commit_list_insert(j
->item
, &reversed
);
690 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
691 clean
= merge_recursive(&o
, head
,
692 remoteheads
->item
, reversed
, &result
);
695 if (write_locked_index(&the_index
, &lock
,
696 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
697 die (_("unable to write %s"), get_index_file());
698 return clean
? 0 : 1;
700 return try_merge_command(strategy
, xopts_nr
, xopts
,
701 common
, head_arg
, remoteheads
);
705 static void count_diff_files(struct diff_queue_struct
*q
,
706 struct diff_options
*opt
, void *data
)
713 static int count_unmerged_entries(void)
717 for (i
= 0; i
< active_nr
; i
++)
718 if (ce_stage(active_cache
[i
]))
724 static void add_strategies(const char *string
, unsigned attr
)
729 struct string_list list
= STRING_LIST_INIT_DUP
;
730 struct string_list_item
*item
;
731 string_list_split(&list
, string
, ' ', -1);
732 for_each_string_list_item(item
, &list
)
733 append_strategy(get_strategy(item
->string
));
734 string_list_clear(&list
, 0);
737 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
738 if (all_strategy
[i
].attr
& attr
)
739 append_strategy(&all_strategy
[i
]);
743 static void read_merge_msg(struct strbuf
*msg
)
745 const char *filename
= git_path_merge_msg(the_repository
);
747 if (strbuf_read_file(msg
, filename
, 0) < 0)
748 die_errno(_("Could not read from '%s'"), filename
);
751 static void write_merge_state(struct commit_list
*);
752 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
755 error("%s", err_msg
);
757 _("Not committing merge; use 'git commit' to complete the merge.\n"));
758 write_merge_state(remoteheads
);
762 static const char merge_editor_comment
[] =
763 N_("Please enter a commit message to explain why this merge is necessary,\n"
764 "especially if it merges an updated upstream into a topic branch.\n"
766 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
769 static void write_merge_heads(struct commit_list
*);
770 static void prepare_to_commit(struct commit_list
*remoteheads
)
772 struct strbuf msg
= STRBUF_INIT
;
773 strbuf_addbuf(&msg
, &merge_msg
);
774 strbuf_addch(&msg
, '\n');
776 BUG("the control must not reach here under --squash");
778 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
780 append_signoff(&msg
, ignore_non_trailer(msg
.buf
, msg
.len
), 0);
781 write_merge_heads(remoteheads
);
782 write_file_buf(git_path_merge_msg(the_repository
), msg
.buf
, msg
.len
);
783 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
784 git_path_merge_msg(the_repository
), "merge", NULL
))
785 abort_commit(remoteheads
, NULL
);
786 if (0 < option_edit
) {
787 if (launch_editor(git_path_merge_msg(the_repository
), NULL
, NULL
))
788 abort_commit(remoteheads
, NULL
);
791 if (verify_msg
&& run_commit_hook(0 < option_edit
, get_index_file(),
793 git_path_merge_msg(the_repository
), NULL
))
794 abort_commit(remoteheads
, NULL
);
796 read_merge_msg(&msg
);
797 strbuf_stripspace(&msg
, 0 < option_edit
);
799 abort_commit(remoteheads
, _("Empty commit message."));
800 strbuf_release(&merge_msg
);
801 strbuf_addbuf(&merge_msg
, &msg
);
802 strbuf_release(&msg
);
805 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
807 struct object_id result_tree
, result_commit
;
808 struct commit_list
*parents
, **pptr
= &parents
;
809 struct lock_file lock
= LOCK_INIT
;
811 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
812 refresh_cache(REFRESH_QUIET
);
813 if (write_locked_index(&the_index
, &lock
,
814 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
815 return error(_("Unable to write index."));
817 write_tree_trivial(&result_tree
);
818 printf(_("Wonderful.\n"));
819 pptr
= commit_list_append(head
, pptr
);
820 pptr
= commit_list_append(remoteheads
->item
, pptr
);
821 prepare_to_commit(remoteheads
);
822 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, &result_tree
, parents
,
823 &result_commit
, NULL
, sign_commit
))
824 die(_("failed to write commit object"));
825 finish(head
, remoteheads
, &result_commit
, "In-index merge");
830 static int finish_automerge(struct commit
*head
,
832 struct commit_list
*common
,
833 struct commit_list
*remoteheads
,
834 struct object_id
*result_tree
,
835 const char *wt_strategy
)
837 struct commit_list
*parents
= NULL
;
838 struct strbuf buf
= STRBUF_INIT
;
839 struct object_id result_commit
;
841 free_commit_list(common
);
842 parents
= remoteheads
;
843 if (!head_subsumed
|| fast_forward
== FF_NO
)
844 commit_list_insert(head
, &parents
);
845 strbuf_addch(&merge_msg
, '\n');
846 prepare_to_commit(remoteheads
);
847 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
848 &result_commit
, NULL
, sign_commit
))
849 die(_("failed to write commit object"));
850 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
851 finish(head
, remoteheads
, &result_commit
, buf
.buf
);
852 strbuf_release(&buf
);
857 static int suggest_conflicts(void)
859 const char *filename
;
861 struct strbuf msgbuf
= STRBUF_INIT
;
863 filename
= git_path_merge_msg(the_repository
);
864 fp
= xfopen(filename
, "a");
866 append_conflicts_hint(&msgbuf
);
867 fputs(msgbuf
.buf
, fp
);
868 strbuf_release(&msgbuf
);
870 rerere(allow_rerere_auto
);
871 printf(_("Automatic merge failed; "
872 "fix conflicts and then commit the result.\n"));
876 static int evaluate_result(void)
881 /* Check how many files differ. */
882 init_revisions(&rev
, "");
883 setup_revisions(0, NULL
, &rev
, NULL
);
884 rev
.diffopt
.output_format
|=
885 DIFF_FORMAT_CALLBACK
;
886 rev
.diffopt
.format_callback
= count_diff_files
;
887 rev
.diffopt
.format_callback_data
= &cnt
;
888 run_diff_files(&rev
, 0);
891 * Check how many unmerged entries are
894 cnt
+= count_unmerged_entries();
900 * Pretend as if the user told us to merge with the remote-tracking
901 * branch we have for the upstream of the current branch
903 static int setup_with_upstream(const char ***argv
)
905 struct branch
*branch
= branch_get(NULL
);
910 die(_("No current branch."));
911 if (!branch
->remote_name
)
912 die(_("No remote for the current branch."));
913 if (!branch
->merge_nr
)
914 die(_("No default upstream defined for the current branch."));
916 args
= xcalloc(st_add(branch
->merge_nr
, 1), sizeof(char *));
917 for (i
= 0; i
< branch
->merge_nr
; i
++) {
918 if (!branch
->merge
[i
]->dst
)
919 die(_("No remote-tracking branch for %s from %s"),
920 branch
->merge
[i
]->src
, branch
->remote_name
);
921 args
[i
] = branch
->merge
[i
]->dst
;
928 static void write_merge_heads(struct commit_list
*remoteheads
)
930 struct commit_list
*j
;
931 struct strbuf buf
= STRBUF_INIT
;
933 for (j
= remoteheads
; j
; j
= j
->next
) {
934 struct object_id
*oid
;
935 struct commit
*c
= j
->item
;
936 struct merge_remote_desc
*desc
;
938 desc
= merge_remote_util(c
);
939 if (desc
&& desc
->obj
) {
940 oid
= &desc
->obj
->oid
;
942 oid
= &c
->object
.oid
;
944 strbuf_addf(&buf
, "%s\n", oid_to_hex(oid
));
946 write_file_buf(git_path_merge_head(the_repository
), buf
.buf
, buf
.len
);
949 if (fast_forward
== FF_NO
)
950 strbuf_addstr(&buf
, "no-ff");
951 write_file_buf(git_path_merge_mode(the_repository
), buf
.buf
, buf
.len
);
952 strbuf_release(&buf
);
955 static void write_merge_state(struct commit_list
*remoteheads
)
957 write_merge_heads(remoteheads
);
958 strbuf_addch(&merge_msg
, '\n');
959 write_file_buf(git_path_merge_msg(the_repository
), merge_msg
.buf
,
963 static int default_edit_option(void)
965 static const char name
[] = "GIT_MERGE_AUTOEDIT";
966 const char *e
= getenv(name
);
967 struct stat st_stdin
, st_stdout
;
970 /* an explicit -m msg without --[no-]edit */
974 int v
= git_parse_maybe_bool(e
);
976 die(_("Bad value '%s' in environment '%s'"), e
, name
);
980 /* Use editor if stdin and stdout are the same and is a tty */
981 return (!fstat(0, &st_stdin
) &&
982 !fstat(1, &st_stdout
) &&
983 isatty(0) && isatty(1) &&
984 st_stdin
.st_dev
== st_stdout
.st_dev
&&
985 st_stdin
.st_ino
== st_stdout
.st_ino
&&
986 st_stdin
.st_mode
== st_stdout
.st_mode
);
989 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
991 struct commit_list
*remoteheads
)
993 struct commit_list
*parents
, **remotes
;
996 * Is the current HEAD reachable from another commit being
997 * merged? If so we do not want to record it as a parent of
998 * the resulting merge, unless --no-ff is given. We will flip
999 * this variable to 0 when we find HEAD among the independent
1000 * tips being merged.
1004 /* Find what parents to record by checking independent ones. */
1005 parents
= reduce_heads(remoteheads
);
1006 free_commit_list(remoteheads
);
1009 remotes
= &remoteheads
;
1011 struct commit
*commit
= pop_commit(&parents
);
1012 if (commit
== head_commit
)
1015 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1020 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
1022 struct fmt_merge_msg_opts opts
;
1024 memset(&opts
, 0, sizeof(opts
));
1025 opts
.add_title
= !have_message
;
1026 opts
.shortlog_len
= shortlog_len
;
1027 opts
.credit_people
= (0 < option_edit
);
1029 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1031 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1034 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1036 const char *filename
;
1038 struct strbuf fetch_head_file
= STRBUF_INIT
;
1041 merge_names
= &fetch_head_file
;
1043 filename
= git_path_fetch_head(the_repository
);
1044 fd
= open(filename
, O_RDONLY
);
1046 die_errno(_("could not open '%s' for reading"), filename
);
1048 if (strbuf_read(merge_names
, fd
, 0) < 0)
1049 die_errno(_("could not read '%s'"), filename
);
1051 die_errno(_("could not close '%s'"), filename
);
1053 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1054 struct object_id oid
;
1056 struct commit
*commit
;
1058 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1060 npos
= ptr
- merge_names
->buf
+ 1;
1062 npos
= merge_names
->len
;
1064 if (npos
- pos
< GIT_SHA1_HEXSZ
+ 2 ||
1065 get_oid_hex(merge_names
->buf
+ pos
, &oid
))
1066 commit
= NULL
; /* bad */
1067 else if (memcmp(merge_names
->buf
+ pos
+ GIT_SHA1_HEXSZ
, "\t\t", 2))
1068 continue; /* not-for-merge */
1070 char saved
= merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
];
1071 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = '\0';
1072 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1073 merge_names
->buf
[pos
+ GIT_SHA1_HEXSZ
] = saved
;
1078 die(_("not something we can merge in %s: %s"),
1079 filename
, merge_names
->buf
+ pos
);
1081 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1084 if (merge_names
== &fetch_head_file
)
1085 strbuf_release(&fetch_head_file
);
1088 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1090 int argc
, const char **argv
,
1091 struct strbuf
*merge_msg
)
1094 struct commit_list
*remoteheads
= NULL
;
1095 struct commit_list
**remotes
= &remoteheads
;
1096 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1098 if (merge_msg
&& (!have_message
|| shortlog_len
))
1099 autogen
= &merge_names
;
1102 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1104 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1105 handle_fetch_head(remotes
, autogen
);
1106 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1108 for (i
= 0; i
< argc
; i
++) {
1109 struct commit
*commit
= get_merge_parent(argv
[i
]);
1111 help_unknown_ref(argv
[i
], "merge",
1112 _("not something we can merge"));
1113 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1115 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1117 struct commit_list
*p
;
1118 for (p
= remoteheads
; p
; p
= p
->next
)
1119 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1124 prepare_merge_message(autogen
, merge_msg
);
1125 strbuf_release(autogen
);
1131 static int merging_a_throwaway_tag(struct commit
*commit
)
1134 struct object_id oid
;
1135 int is_throwaway_tag
= 0;
1137 /* Are we merging a tag? */
1138 if (!merge_remote_util(commit
) ||
1139 !merge_remote_util(commit
)->obj
||
1140 merge_remote_util(commit
)->obj
->type
!= OBJ_TAG
)
1141 return is_throwaway_tag
;
1144 * Now we know we are merging a tag object. Are we downstream
1145 * and following the tags from upstream? If so, we must have
1146 * the tag object pointed at by "refs/tags/$T" where $T is the
1147 * tagname recorded in the tag object. We want to allow such
1148 * a "just to catch up" merge to fast-forward.
1150 * Otherwise, we are playing an integrator's role, making a
1151 * merge with a throw-away tag from a contributor with
1152 * something like "git pull $contributor $signed_tag".
1153 * We want to forbid such a merge from fast-forwarding
1154 * by default; otherwise we would not keep the signature
1157 tag_ref
= xstrfmt("refs/tags/%s",
1158 ((struct tag
*)merge_remote_util(commit
)->obj
)->tag
);
1159 if (!read_ref(tag_ref
, &oid
) &&
1160 !oidcmp(&oid
, &merge_remote_util(commit
)->obj
->oid
))
1161 is_throwaway_tag
= 0;
1163 is_throwaway_tag
= 1;
1165 return is_throwaway_tag
;
1168 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1170 struct object_id result_tree
, stash
, head_oid
;
1171 struct commit
*head_commit
;
1172 struct strbuf buf
= STRBUF_INIT
;
1173 int 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
;
1179 int orig_argc
= argc
;
1181 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1182 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1185 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1188 branch
= branch_to_free
= resolve_refdup("HEAD", 0, &head_oid
, NULL
);
1190 skip_prefix(branch
, "refs/heads/", &branch
);
1192 init_diff_ui_defaults();
1193 git_config(git_merge_config
, NULL
);
1195 if (!branch
|| is_null_oid(&head_oid
))
1198 head_commit
= lookup_commit_or_die(&head_oid
, "HEAD");
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
};
1215 usage_msg_opt(_("--abort expects no arguments"),
1216 builtin_merge_usage
, builtin_merge_options
);
1218 if (!file_exists(git_path_merge_head(the_repository
)))
1219 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1221 /* Invoke 'git reset --merge' */
1222 ret
= cmd_reset(nargc
, nargv
, prefix
);
1226 if (continue_current_merge
) {
1228 const char *nargv
[] = {"commit", NULL
};
1231 usage_msg_opt(_("--continue expects no arguments"),
1232 builtin_merge_usage
, builtin_merge_options
);
1234 if (!file_exists(git_path_merge_head(the_repository
)))
1235 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1237 /* Invoke 'git commit' */
1238 ret
= cmd_commit(nargc
, nargv
, prefix
);
1242 if (read_cache_unmerged())
1243 die_resolve_conflict("merge");
1245 if (file_exists(git_path_merge_head(the_repository
))) {
1247 * There is no unmerged entry, don't advise 'git
1248 * add/rm <file>', just 'git commit'.
1250 if (advice_resolve_conflict
)
1251 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1252 "Please, commit your changes before you merge."));
1254 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1256 if (file_exists(git_path_cherry_pick_head(the_repository
))) {
1257 if (advice_resolve_conflict
)
1258 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1259 "Please, commit your changes before you merge."));
1261 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1263 resolve_undo_clear();
1269 if (fast_forward
== FF_NO
)
1270 die(_("You cannot combine --squash with --no-ff."));
1275 if (default_to_upstream
)
1276 argc
= setup_with_upstream(&argv
);
1278 die(_("No commit specified and merge.defaultToUpstream not set."));
1279 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1284 usage_with_options(builtin_merge_usage
,
1285 builtin_merge_options
);
1289 * If the merged head is a valid one there is no reason
1290 * to forbid "git merge" into a branch yet to be born.
1291 * We do the same for "git pull".
1293 struct object_id
*remote_head_oid
;
1295 die(_("Squash commit into empty head not supported yet"));
1296 if (fast_forward
== FF_NO
)
1297 die(_("Non-fast-forward commit does not make sense into "
1299 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1302 die(_("%s - not something we can merge"), argv
[0]);
1303 if (remoteheads
->next
)
1304 die(_("Can merge only exactly one commit into empty head"));
1305 remote_head_oid
= &remoteheads
->item
->object
.oid
;
1306 read_empty(remote_head_oid
, 0);
1307 update_ref("initial pull", "HEAD", remote_head_oid
, NULL
, 0,
1308 UPDATE_REFS_DIE_ON_ERR
);
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
,
1318 argc
, argv
, &merge_msg
);
1320 if (!head_commit
|| !argc
)
1321 usage_with_options(builtin_merge_usage
,
1322 builtin_merge_options
);
1324 if (verify_signatures
) {
1325 for (p
= remoteheads
; p
; p
= p
->next
) {
1326 struct commit
*commit
= p
->item
;
1327 char hex
[GIT_MAX_HEXSZ
+ 1];
1328 struct signature_check signature_check
;
1329 memset(&signature_check
, 0, sizeof(signature_check
));
1331 check_commit_signature(commit
, &signature_check
);
1333 find_unique_abbrev_r(hex
, &commit
->object
.oid
, DEFAULT_ABBREV
);
1334 switch (signature_check
.result
) {
1338 die(_("Commit %s has an untrusted GPG signature, "
1339 "allegedly by %s."), hex
, signature_check
.signer
);
1341 die(_("Commit %s has a bad GPG signature "
1342 "allegedly by %s."), hex
, signature_check
.signer
);
1344 die(_("Commit %s does not have a GPG signature."), hex
);
1346 if (verbosity
>= 0 && signature_check
.result
== 'G')
1347 printf(_("Commit %s has a good GPG signature by %s\n"),
1348 hex
, signature_check
.signer
);
1350 signature_check_clear(&signature_check
);
1354 strbuf_addstr(&buf
, "merge");
1355 for (p
= remoteheads
; p
; p
= p
->next
)
1356 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1357 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1360 for (p
= remoteheads
; p
; p
= p
->next
) {
1361 struct commit
*commit
= p
->item
;
1362 strbuf_addf(&buf
, "GITHEAD_%s",
1363 oid_to_hex(&commit
->object
.oid
));
1364 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1366 if (fast_forward
!= FF_ONLY
&& merging_a_throwaway_tag(commit
))
1367 fast_forward
= FF_NO
;
1370 if (option_edit
< 0)
1371 option_edit
= default_edit_option();
1373 if (!use_strategies
) {
1375 ; /* already up-to-date */
1376 else if (!remoteheads
->next
)
1377 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1379 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1382 for (i
= 0; i
< use_strategies_nr
; i
++) {
1383 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1384 fast_forward
= FF_NO
;
1385 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1390 ; /* already up-to-date */
1391 else if (!remoteheads
->next
)
1392 common
= get_merge_bases(head_commit
, remoteheads
->item
);
1394 struct commit_list
*list
= remoteheads
;
1395 commit_list_insert(head_commit
, &list
);
1396 common
= get_octopus_merge_bases(list
);
1400 update_ref("updating ORIG_HEAD", "ORIG_HEAD",
1401 &head_commit
->object
.oid
, NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1403 if (remoteheads
&& !common
) {
1404 /* No common ancestors found. */
1405 if (!allow_unrelated_histories
)
1406 die(_("refusing to merge unrelated histories"));
1407 /* otherwise, we need a real merge. */
1408 } else if (!remoteheads
||
1409 (!remoteheads
->next
&& !common
->next
&&
1410 common
->item
== remoteheads
->item
)) {
1412 * If head can reach all the merge then we are up to date.
1413 * but first the most common case of merging one remote.
1415 finish_up_to_date(_("Already up to date."));
1417 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1419 !oidcmp(&common
->item
->object
.oid
, &head_commit
->object
.oid
)) {
1420 /* Again the most common case of merging one remote. */
1421 struct strbuf msg
= STRBUF_INIT
;
1422 struct commit
*commit
;
1424 if (verbosity
>= 0) {
1425 printf(_("Updating %s..%s\n"),
1426 find_unique_abbrev(&head_commit
->object
.oid
,
1428 find_unique_abbrev(&remoteheads
->item
->object
.oid
,
1431 strbuf_addstr(&msg
, "Fast-forward");
1434 " (no commit created; -m option ignored)");
1435 commit
= remoteheads
->item
;
1441 if (checkout_fast_forward(&head_commit
->object
.oid
,
1442 &commit
->object
.oid
,
1443 overwrite_ignore
)) {
1448 finish(head_commit
, remoteheads
, &commit
->object
.oid
, msg
.buf
);
1451 } else if (!remoteheads
->next
&& common
->next
)
1454 * We are not doing octopus and not fast-forward. Need
1457 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1459 * We are not doing octopus, not fast-forward, and have
1462 refresh_cache(REFRESH_QUIET
);
1463 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1464 /* See if it is really trivial. */
1465 git_committer_info(IDENT_STRICT
);
1466 printf(_("Trying really trivial in-index merge...\n"));
1467 if (!read_tree_trivial(&common
->item
->object
.oid
,
1468 &head_commit
->object
.oid
,
1469 &remoteheads
->item
->object
.oid
)) {
1470 ret
= merge_trivial(head_commit
, remoteheads
);
1473 printf(_("Nope.\n"));
1477 * An octopus. If we can reach all the remote we are up
1481 struct commit_list
*j
;
1483 for (j
= remoteheads
; j
; j
= j
->next
) {
1484 struct commit_list
*common_one
;
1487 * Here we *have* to calculate the individual
1488 * merge_bases again, otherwise "git merge HEAD^
1489 * HEAD^^" would be missed.
1491 common_one
= get_merge_bases(head_commit
, j
->item
);
1492 if (oidcmp(&common_one
->item
->object
.oid
, &j
->item
->object
.oid
)) {
1498 finish_up_to_date(_("Already up to date. Yeeah!"));
1503 if (fast_forward
== FF_ONLY
)
1504 die(_("Not possible to fast-forward, aborting."));
1506 /* We are going to make a new commit. */
1507 git_committer_info(IDENT_STRICT
);
1510 * At this point, we need a real merge. No matter what strategy
1511 * we use, it would operate on the index, possibly affecting the
1512 * working tree, and when resolved cleanly, have the desired
1513 * tree in the index -- this means that the index must be in
1514 * sync with the head commit. The strategies are responsible
1517 if (use_strategies_nr
== 1 ||
1519 * Stash away the local changes so that we can try more than one.
1524 for (i
= 0; i
< use_strategies_nr
; i
++) {
1527 printf(_("Rewinding the tree to pristine...\n"));
1528 restore_state(&head_commit
->object
.oid
, &stash
);
1530 if (use_strategies_nr
!= 1)
1531 printf(_("Trying merge strategy %s...\n"),
1532 use_strategies
[i
]->name
);
1534 * Remember which strategy left the state in the working
1537 wt_strategy
= use_strategies
[i
]->name
;
1539 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1540 common
, remoteheads
,
1542 if (!option_commit
&& !ret
) {
1545 * This is necessary here just to avoid writing
1546 * the tree, but later we will *not* exit with
1547 * status code 1 because merge_was_ok is set.
1554 * The backend exits with 1 when conflicts are
1555 * left to be resolved, with 2 when it does not
1556 * handle the given merge at all.
1559 int cnt
= evaluate_result();
1561 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1562 best_strategy
= use_strategies
[i
]->name
;
1572 /* Automerge succeeded. */
1573 write_tree_trivial(&result_tree
);
1574 automerge_was_ok
= 1;
1579 * If we have a resulting tree, that means the strategy module
1580 * auto resolved the merge cleanly.
1582 if (automerge_was_ok
) {
1583 ret
= finish_automerge(head_commit
, head_subsumed
,
1584 common
, remoteheads
,
1585 &result_tree
, wt_strategy
);
1590 * Pick the result from the best strategy and have the user fix
1593 if (!best_strategy
) {
1594 restore_state(&head_commit
->object
.oid
, &stash
);
1595 if (use_strategies_nr
> 1)
1597 _("No merge strategy handled the merge.\n"));
1599 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1600 use_strategies
[0]->name
);
1603 } else if (best_strategy
== wt_strategy
)
1604 ; /* We already have its result in the working tree. */
1606 printf(_("Rewinding the tree to pristine...\n"));
1607 restore_state(&head_commit
->object
.oid
, &stash
);
1608 printf(_("Using the %s to prepare resolving by hand.\n"),
1610 try_merge_strategy(best_strategy
, common
, remoteheads
,
1615 finish(head_commit
, remoteheads
, NULL
, NULL
);
1617 write_merge_state(remoteheads
);
1620 fprintf(stderr
, _("Automatic merge went well; "
1621 "stopped before committing as requested\n"));
1623 ret
= suggest_conflicts();
1626 free(branch_to_free
);