4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
9 #define USE_THE_INDEX_COMPATIBILITY_MACROS
12 #include "parse-options.h"
15 #include "run-command.h"
17 #include "diff-merges.h"
23 #include "unpack-trees.h"
24 #include "cache-tree.h"
31 #include "merge-recursive.h"
32 #include "merge-ort-wrappers.h"
33 #include "resolve-undo.h"
35 #include "fmt-merge-msg.h"
36 #include "gpg-interface.h"
37 #include "sequencer.h"
38 #include "string-list.h"
43 #include "commit-reach.h"
44 #include "wt-status.h"
45 #include "commit-graph.h"
47 #define DEFAULT_TWOHEAD (1<<0)
48 #define DEFAULT_OCTOPUS (1<<1)
49 #define NO_FAST_FORWARD (1<<2)
50 #define NO_TRIVIAL (1<<3)
57 static const char * const builtin_merge_usage
[] = {
58 N_("git merge [<options>] [<commit>...]"),
60 "git merge --continue",
64 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
65 static int option_commit
= -1;
66 static int option_edit
= -1;
67 static int allow_trivial
= 1, have_message
, verify_signatures
;
68 static int check_trust_level
= 1;
69 static int overwrite_ignore
= 1;
70 static struct strbuf merge_msg
= STRBUF_INIT
;
71 static struct strategy
**use_strategies
;
72 static size_t use_strategies_nr
, use_strategies_alloc
;
73 static const char **xopts
;
74 static size_t xopts_nr
, xopts_alloc
;
75 static const char *branch
;
76 static char *branch_mergeoptions
;
78 static int allow_rerere_auto
;
79 static int abort_current_merge
;
80 static int quit_current_merge
;
81 static int continue_current_merge
;
82 static int allow_unrelated_histories
;
83 static int show_progress
= -1;
84 static int default_to_upstream
= 1;
86 static const char *sign_commit
;
90 static struct strategy all_strategy
[] = {
91 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
92 { "octopus", DEFAULT_OCTOPUS
},
93 { "ort", NO_TRIVIAL
},
95 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
96 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
99 static const char *pull_twohead
, *pull_octopus
;
107 static enum ff_type fast_forward
= FF_ALLOW
;
109 static const char *cleanup_arg
;
110 static enum commit_msg_cleanup_mode cleanup_mode
;
112 static int option_parse_message(const struct option
*opt
,
113 const char *arg
, int unset
)
115 struct strbuf
*buf
= opt
->value
;
118 strbuf_setlen(buf
, 0);
120 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
123 return error(_("switch `m' requires a value"));
127 static enum parse_opt_result
option_read_message(struct parse_opt_ctx_t
*ctx
,
128 const struct option
*opt
,
129 const char *arg_not_used
,
132 struct strbuf
*buf
= opt
->value
;
135 BUG_ON_OPT_ARG(arg_not_used
);
137 BUG("-F cannot be negated");
142 } else if (ctx
->argc
> 1) {
146 return error(_("option `%s' requires a value"), opt
->long_name
);
149 strbuf_addch(buf
, '\n');
150 if (ctx
->prefix
&& !is_absolute_path(arg
))
151 arg
= prefix_filename(ctx
->prefix
, arg
);
152 if (strbuf_read_file(buf
, arg
, 0) < 0)
153 return error(_("could not read file '%s'"), arg
);
159 static struct strategy
*get_strategy(const char *name
)
162 struct strategy
*ret
;
163 static struct cmdnames main_cmds
, other_cmds
;
165 char *default_strategy
= getenv("GIT_TEST_MERGE_ALGORITHM");
170 if (default_strategy
&&
171 !strcmp(default_strategy
, "ort") &&
172 !strcmp(name
, "recursive")) {
176 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
177 if (!strcmp(name
, all_strategy
[i
].name
))
178 return &all_strategy
[i
];
181 struct cmdnames not_strategies
;
184 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
185 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
186 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
188 struct cmdname
*ent
= main_cmds
.names
[i
];
189 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
190 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
191 && !all_strategy
[j
].name
[ent
->len
])
194 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
196 exclude_cmds(&main_cmds
, ¬_strategies
);
198 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
199 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
200 fprintf(stderr
, _("Available strategies are:"));
201 for (i
= 0; i
< main_cmds
.cnt
; i
++)
202 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
203 fprintf(stderr
, ".\n");
204 if (other_cmds
.cnt
) {
205 fprintf(stderr
, _("Available custom strategies are:"));
206 for (i
= 0; i
< other_cmds
.cnt
; i
++)
207 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
208 fprintf(stderr
, ".\n");
213 CALLOC_ARRAY(ret
, 1);
214 ret
->name
= xstrdup(name
);
215 ret
->attr
= NO_TRIVIAL
;
219 static void append_strategy(struct strategy
*s
)
221 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
222 use_strategies
[use_strategies_nr
++] = s
;
225 static int option_parse_strategy(const struct option
*opt
,
226 const char *name
, int unset
)
231 append_strategy(get_strategy(name
));
235 static int option_parse_x(const struct option
*opt
,
236 const char *arg
, int unset
)
241 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
242 xopts
[xopts_nr
++] = xstrdup(arg
);
246 static int option_parse_n(const struct option
*opt
,
247 const char *arg
, int unset
)
250 show_diffstat
= unset
;
254 static struct option builtin_merge_options
[] = {
255 OPT_CALLBACK_F('n', NULL
, NULL
, NULL
,
256 N_("do not show a diffstat at the end of the merge"),
257 PARSE_OPT_NOARG
, option_parse_n
),
258 OPT_BOOL(0, "stat", &show_diffstat
,
259 N_("show a diffstat at the end of the merge")),
260 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
261 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
262 N_("add (at most <n>) entries from shortlog to merge commit message"),
263 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
264 OPT_BOOL(0, "squash", &squash
,
265 N_("create a single commit instead of doing a merge")),
266 OPT_BOOL(0, "commit", &option_commit
,
267 N_("perform a commit if the merge succeeds (default)")),
268 OPT_BOOL('e', "edit", &option_edit
,
269 N_("edit message before committing")),
270 OPT_CLEANUP(&cleanup_arg
),
271 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
272 OPT_SET_INT_F(0, "ff-only", &fast_forward
,
273 N_("abort if fast-forward is not possible"),
274 FF_ONLY
, PARSE_OPT_NONEG
),
275 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
276 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
277 N_("verify that the named commit has a valid GPG signature")),
278 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
279 N_("merge strategy to use"), option_parse_strategy
),
280 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
281 N_("option for selected merge strategy"), option_parse_x
),
282 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
283 N_("merge commit message (for a non-fast-forward merge)"),
284 option_parse_message
),
285 { OPTION_LOWLEVEL_CALLBACK
, 'F', "file", &merge_msg
, N_("path"),
286 N_("read message from file"), PARSE_OPT_NONEG
,
287 NULL
, 0, option_read_message
},
288 OPT__VERBOSITY(&verbosity
),
289 OPT_BOOL(0, "abort", &abort_current_merge
,
290 N_("abort the current in-progress merge")),
291 OPT_BOOL(0, "quit", &quit_current_merge
,
292 N_("--abort but leave index and working tree alone")),
293 OPT_BOOL(0, "continue", &continue_current_merge
,
294 N_("continue the current in-progress merge")),
295 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories
,
296 N_("allow merging unrelated histories")),
297 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
298 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
299 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
300 OPT_AUTOSTASH(&autostash
),
301 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
302 OPT_BOOL(0, "signoff", &signoff
, N_("add a Signed-off-by trailer")),
303 OPT_BOOL(0, "no-verify", &no_verify
, N_("bypass pre-merge-commit and commit-msg hooks")),
307 static int save_state(struct object_id
*stash
)
310 struct child_process cp
= CHILD_PROCESS_INIT
;
311 struct strbuf buffer
= STRBUF_INIT
;
312 const char *argv
[] = {"stash", "create", NULL
};
319 if (start_command(&cp
))
320 die(_("could not run stash."));
321 len
= strbuf_read(&buffer
, cp
.out
, 1024);
324 if (finish_command(&cp
) || len
< 0)
325 die(_("stash failed"));
326 else if (!len
) /* no changes */
328 strbuf_setlen(&buffer
, buffer
.len
-1);
329 if (get_oid(buffer
.buf
, stash
))
330 die(_("not a valid object: %s"), buffer
.buf
);
333 strbuf_release(&buffer
);
337 static void read_empty(const struct object_id
*oid
, int verbose
)
342 args
[i
++] = "read-tree";
347 args
[i
++] = empty_tree_oid_hex();
348 args
[i
++] = oid_to_hex(oid
);
351 if (run_command_v_opt(args
, RUN_GIT_CMD
))
352 die(_("read-tree failed"));
355 static void reset_hard(const struct object_id
*oid
, int verbose
)
360 args
[i
++] = "read-tree";
363 args
[i
++] = "--reset";
365 args
[i
++] = oid_to_hex(oid
);
368 if (run_command_v_opt(args
, RUN_GIT_CMD
))
369 die(_("read-tree failed"));
372 static void restore_state(const struct object_id
*head
,
373 const struct object_id
*stash
)
375 struct strbuf sb
= STRBUF_INIT
;
376 const char *args
[] = { "stash", "apply", NULL
, NULL
};
378 if (is_null_oid(stash
))
383 args
[2] = oid_to_hex(stash
);
386 * It is OK to ignore error here, for example when there was
387 * nothing to restore.
389 run_command_v_opt(args
, RUN_GIT_CMD
);
392 refresh_cache(REFRESH_QUIET
);
395 /* This is called when no merge was necessary. */
396 static void finish_up_to_date(void)
398 if (verbosity
>= 0) {
400 puts(_("Already up to date. (nothing to squash)"));
402 puts(_("Already up to date."));
404 remove_merge_branch_state(the_repository
);
407 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
410 struct strbuf out
= STRBUF_INIT
;
411 struct commit_list
*j
;
412 struct pretty_print_context ctx
= {0};
414 printf(_("Squash commit -- not updating HEAD\n"));
416 repo_init_revisions(the_repository
, &rev
, NULL
);
417 diff_merges_suppress(&rev
);
418 rev
.commit_format
= CMIT_FMT_MEDIUM
;
420 commit
->object
.flags
|= UNINTERESTING
;
421 add_pending_object(&rev
, &commit
->object
, NULL
);
423 for (j
= remoteheads
; j
; j
= j
->next
)
424 add_pending_object(&rev
, &j
->item
->object
, NULL
);
426 setup_revisions(0, NULL
, &rev
, NULL
);
427 if (prepare_revision_walk(&rev
))
428 die(_("revision walk setup failed"));
430 ctx
.abbrev
= rev
.abbrev
;
431 ctx
.date_mode
= rev
.date_mode
;
432 ctx
.fmt
= rev
.commit_format
;
434 strbuf_addstr(&out
, "Squashed commit of the following:\n");
435 while ((commit
= get_revision(&rev
)) != NULL
) {
436 strbuf_addch(&out
, '\n');
437 strbuf_addf(&out
, "commit %s\n",
438 oid_to_hex(&commit
->object
.oid
));
439 pretty_print_commit(&ctx
, commit
, &out
);
441 write_file_buf(git_path_squash_msg(the_repository
), out
.buf
, out
.len
);
442 strbuf_release(&out
);
445 static void finish(struct commit
*head_commit
,
446 struct commit_list
*remoteheads
,
447 const struct object_id
*new_head
, const char *msg
)
449 struct strbuf reflog_message
= STRBUF_INIT
;
450 const struct object_id
*head
= &head_commit
->object
.oid
;
453 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
457 strbuf_addf(&reflog_message
, "%s: %s",
458 getenv("GIT_REFLOG_ACTION"), msg
);
461 squash_message(head_commit
, remoteheads
);
463 if (verbosity
>= 0 && !merge_msg
.len
)
464 printf(_("No merge message -- not updating HEAD\n"));
466 update_ref(reflog_message
.buf
, "HEAD", new_head
, head
,
467 0, UPDATE_REFS_DIE_ON_ERR
);
469 * We ignore errors in 'gc --auto', since the
470 * user should see them.
472 close_object_store(the_repository
->objects
);
473 run_auto_maintenance(verbosity
< 0);
476 if (new_head
&& show_diffstat
) {
477 struct diff_options opts
;
478 repo_diff_setup(the_repository
, &opts
);
479 opts
.stat_width
= -1; /* use full terminal width */
480 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
481 opts
.output_format
|=
482 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
483 opts
.detect_rename
= DIFF_DETECT_RENAME
;
484 diff_setup_done(&opts
);
485 diff_tree_oid(head
, new_head
, "", &opts
);
490 /* Run a post-merge hook */
491 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
493 apply_autostash(git_path_merge_autostash(the_repository
));
494 strbuf_release(&reflog_message
);
497 /* Get the name for the merge commit's message. */
498 static void merge_name(const char *remote
, struct strbuf
*msg
)
500 struct commit
*remote_head
;
501 struct object_id branch_head
;
502 struct strbuf buf
= STRBUF_INIT
;
503 struct strbuf bname
= STRBUF_INIT
;
504 struct merge_remote_desc
*desc
;
506 char *found_ref
= NULL
;
509 strbuf_branchname(&bname
, remote
, 0);
512 oidclr(&branch_head
);
513 remote_head
= get_merge_parent(remote
);
515 die(_("'%s' does not point to a commit"), remote
);
517 if (dwim_ref(remote
, strlen(remote
), &branch_head
, &found_ref
, 0) > 0) {
518 if (starts_with(found_ref
, "refs/heads/")) {
519 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
520 oid_to_hex(&branch_head
), remote
);
523 if (starts_with(found_ref
, "refs/tags/")) {
524 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
525 oid_to_hex(&branch_head
), remote
);
528 if (starts_with(found_ref
, "refs/remotes/")) {
529 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
530 oid_to_hex(&branch_head
), remote
);
535 /* See if remote matches <name>^^^.. or <name>~<number> */
536 for (len
= 0, ptr
= remote
+ strlen(remote
);
537 remote
< ptr
&& ptr
[-1] == '^';
544 ptr
= strrchr(remote
, '~');
546 int seen_nonzero
= 0;
549 while (*++ptr
&& isdigit(*ptr
)) {
550 seen_nonzero
|= (*ptr
!= '0');
554 len
= 0; /* not ...~<number> */
555 else if (seen_nonzero
)
558 early
= 1; /* "name~" is "name~1"! */
562 struct strbuf truname
= STRBUF_INIT
;
563 strbuf_addf(&truname
, "refs/heads/%s", remote
);
564 strbuf_setlen(&truname
, truname
.len
- len
);
565 if (ref_exists(truname
.buf
)) {
567 "%s\t\tbranch '%s'%s of .\n",
568 oid_to_hex(&remote_head
->object
.oid
),
570 (early
? " (early part)" : ""));
571 strbuf_release(&truname
);
574 strbuf_release(&truname
);
577 desc
= merge_remote_util(remote_head
);
578 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
579 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
580 oid_to_hex(&desc
->obj
->oid
),
581 type_name(desc
->obj
->type
),
586 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
587 oid_to_hex(&remote_head
->object
.oid
), remote
);
590 strbuf_release(&buf
);
591 strbuf_release(&bname
);
594 static void parse_branch_merge_options(char *bmo
)
601 argc
= split_cmdline(bmo
, &argv
);
603 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
604 _(split_cmdline_strerror(argc
)));
605 REALLOC_ARRAY(argv
, argc
+ 2);
606 MOVE_ARRAY(argv
+ 1, argv
, argc
+ 1);
608 argv
[0] = "branch.*.mergeoptions";
609 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
610 builtin_merge_usage
, 0);
614 static int git_merge_config(const char *k
, const char *v
, void *cb
)
620 skip_prefix(k
, "branch.", &str
) &&
621 skip_prefix(str
, branch
, &str
) &&
622 !strcmp(str
, ".mergeoptions")) {
623 free(branch_mergeoptions
);
624 branch_mergeoptions
= xstrdup(v
);
628 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
629 show_diffstat
= git_config_bool(k
, v
);
630 else if (!strcmp(k
, "merge.verifysignatures"))
631 verify_signatures
= git_config_bool(k
, v
);
632 else if (!strcmp(k
, "pull.twohead"))
633 return git_config_string(&pull_twohead
, k
, v
);
634 else if (!strcmp(k
, "pull.octopus"))
635 return git_config_string(&pull_octopus
, k
, v
);
636 else if (!strcmp(k
, "commit.cleanup"))
637 return git_config_string(&cleanup_arg
, k
, v
);
638 else if (!strcmp(k
, "merge.ff")) {
639 int boolval
= git_parse_maybe_bool(v
);
641 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
642 } else if (v
&& !strcmp(v
, "only")) {
643 fast_forward
= FF_ONLY
;
644 } /* do not barf on values from future versions of git */
646 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
647 default_to_upstream
= git_config_bool(k
, v
);
649 } else if (!strcmp(k
, "commit.gpgsign")) {
650 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
652 } else if (!strcmp(k
, "gpg.mintrustlevel")) {
653 check_trust_level
= 0;
654 } else if (!strcmp(k
, "merge.autostash")) {
655 autostash
= git_config_bool(k
, v
);
659 status
= fmt_merge_msg_config(k
, v
, cb
);
662 status
= git_gpg_config(k
, v
, NULL
);
665 return git_diff_ui_config(k
, v
, cb
);
668 static int read_tree_trivial(struct object_id
*common
, struct object_id
*head
,
669 struct object_id
*one
)
672 struct tree
*trees
[MAX_UNPACK_TREES
];
673 struct tree_desc t
[MAX_UNPACK_TREES
];
674 struct unpack_trees_options opts
;
676 memset(&opts
, 0, sizeof(opts
));
678 opts
.src_index
= &the_index
;
679 opts
.dst_index
= &the_index
;
681 opts
.verbose_update
= 1;
682 opts
.trivial_merges_only
= 1;
684 trees
[nr_trees
] = parse_tree_indirect(common
);
685 if (!trees
[nr_trees
++])
687 trees
[nr_trees
] = parse_tree_indirect(head
);
688 if (!trees
[nr_trees
++])
690 trees
[nr_trees
] = parse_tree_indirect(one
);
691 if (!trees
[nr_trees
++])
693 opts
.fn
= threeway_merge
;
694 cache_tree_free(&active_cache_tree
);
695 for (i
= 0; i
< nr_trees
; i
++) {
696 parse_tree(trees
[i
]);
697 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
699 if (unpack_trees(nr_trees
, t
, &opts
))
704 static void write_tree_trivial(struct object_id
*oid
)
706 if (write_cache_as_tree(oid
, 0, NULL
))
707 die(_("git write-tree failed to write a tree"));
710 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
711 struct commit_list
*remoteheads
,
714 const char *head_arg
= "HEAD";
716 if (refresh_and_write_cache(REFRESH_QUIET
, SKIP_IF_UNCHANGED
, 0) < 0)
717 return error(_("Unable to write index."));
719 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree") ||
720 !strcmp(strategy
, "ort")) {
721 struct lock_file lock
= LOCK_INIT
;
723 struct commit
*result
;
724 struct commit_list
*reversed
= NULL
;
725 struct merge_options o
;
726 struct commit_list
*j
;
728 if (remoteheads
->next
) {
729 error(_("Not handling anything other than two heads merge."));
733 init_merge_options(&o
, the_repository
);
734 if (!strcmp(strategy
, "subtree"))
735 o
.subtree_shift
= "";
737 o
.show_rename_progress
=
738 show_progress
== -1 ? isatty(2) : show_progress
;
740 for (x
= 0; x
< xopts_nr
; x
++)
741 if (parse_merge_opt(&o
, xopts
[x
]))
742 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
744 o
.branch1
= head_arg
;
745 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
747 for (j
= common
; j
; j
= j
->next
)
748 commit_list_insert(j
->item
, &reversed
);
750 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
751 if (!strcmp(strategy
, "ort"))
752 clean
= merge_ort_recursive(&o
, head
, remoteheads
->item
,
755 clean
= merge_recursive(&o
, head
, remoteheads
->item
,
759 if (write_locked_index(&the_index
, &lock
,
760 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
761 die(_("unable to write %s"), get_index_file());
762 return clean
? 0 : 1;
764 return try_merge_command(the_repository
,
765 strategy
, xopts_nr
, xopts
,
766 common
, head_arg
, remoteheads
);
770 static void count_diff_files(struct diff_queue_struct
*q
,
771 struct diff_options
*opt
, void *data
)
778 static int count_unmerged_entries(void)
782 for (i
= 0; i
< active_nr
; i
++)
783 if (ce_stage(active_cache
[i
]))
789 static void add_strategies(const char *string
, unsigned attr
)
794 struct string_list list
= STRING_LIST_INIT_DUP
;
795 struct string_list_item
*item
;
796 string_list_split(&list
, string
, ' ', -1);
797 for_each_string_list_item(item
, &list
)
798 append_strategy(get_strategy(item
->string
));
799 string_list_clear(&list
, 0);
802 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
803 if (all_strategy
[i
].attr
& attr
)
804 append_strategy(&all_strategy
[i
]);
808 static void read_merge_msg(struct strbuf
*msg
)
810 const char *filename
= git_path_merge_msg(the_repository
);
812 if (strbuf_read_file(msg
, filename
, 0) < 0)
813 die_errno(_("Could not read from '%s'"), filename
);
816 static void write_merge_state(struct commit_list
*);
817 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
820 error("%s", err_msg
);
822 _("Not committing merge; use 'git commit' to complete the merge.\n"));
823 write_merge_state(remoteheads
);
827 static const char merge_editor_comment
[] =
828 N_("Please enter a commit message to explain why this merge is necessary,\n"
829 "especially if it merges an updated upstream into a topic branch.\n"
832 static const char scissors_editor_comment
[] =
833 N_("An empty message aborts the commit.\n");
835 static const char no_scissors_editor_comment
[] =
836 N_("Lines starting with '%c' will be ignored, and an empty message aborts\n"
839 static void write_merge_heads(struct commit_list
*);
840 static void prepare_to_commit(struct commit_list
*remoteheads
)
842 struct strbuf msg
= STRBUF_INIT
;
843 const char *index_file
= get_index_file();
845 if (!no_verify
&& run_commit_hook(0 < option_edit
, index_file
, "pre-merge-commit", NULL
))
846 abort_commit(remoteheads
, NULL
);
848 * Re-read the index as pre-merge-commit hook could have updated it,
849 * and write it out as a tree. We must do this before we invoke
850 * the editor and after we invoke run_status above.
852 if (find_hook("pre-merge-commit"))
854 read_cache_from(index_file
);
855 strbuf_addbuf(&msg
, &merge_msg
);
857 BUG("the control must not reach here under --squash");
858 if (0 < option_edit
) {
859 strbuf_addch(&msg
, '\n');
860 if (cleanup_mode
== COMMIT_MSG_CLEANUP_SCISSORS
) {
861 wt_status_append_cut_line(&msg
);
862 strbuf_commented_addf(&msg
, "\n");
864 strbuf_commented_addf(&msg
, _(merge_editor_comment
));
865 strbuf_commented_addf(&msg
, _(cleanup_mode
== COMMIT_MSG_CLEANUP_SCISSORS
?
866 scissors_editor_comment
:
867 no_scissors_editor_comment
), comment_line_char
);
870 append_signoff(&msg
, ignore_non_trailer(msg
.buf
, msg
.len
), 0);
871 write_merge_heads(remoteheads
);
872 write_file_buf(git_path_merge_msg(the_repository
), msg
.buf
, msg
.len
);
873 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
874 git_path_merge_msg(the_repository
), "merge", NULL
))
875 abort_commit(remoteheads
, NULL
);
876 if (0 < option_edit
) {
877 if (launch_editor(git_path_merge_msg(the_repository
), NULL
, NULL
))
878 abort_commit(remoteheads
, NULL
);
881 if (!no_verify
&& run_commit_hook(0 < option_edit
, get_index_file(),
883 git_path_merge_msg(the_repository
), NULL
))
884 abort_commit(remoteheads
, NULL
);
886 read_merge_msg(&msg
);
887 cleanup_message(&msg
, cleanup_mode
, 0);
889 abort_commit(remoteheads
, _("Empty commit message."));
890 strbuf_release(&merge_msg
);
891 strbuf_addbuf(&merge_msg
, &msg
);
892 strbuf_release(&msg
);
895 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
897 struct object_id result_tree
, result_commit
;
898 struct commit_list
*parents
, **pptr
= &parents
;
900 if (refresh_and_write_cache(REFRESH_QUIET
, SKIP_IF_UNCHANGED
, 0) < 0)
901 return error(_("Unable to write index."));
903 write_tree_trivial(&result_tree
);
904 printf(_("Wonderful.\n"));
905 pptr
= commit_list_append(head
, pptr
);
906 pptr
= commit_list_append(remoteheads
->item
, pptr
);
907 prepare_to_commit(remoteheads
);
908 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, &result_tree
, parents
,
909 &result_commit
, NULL
, sign_commit
))
910 die(_("failed to write commit object"));
911 finish(head
, remoteheads
, &result_commit
, "In-index merge");
912 remove_merge_branch_state(the_repository
);
916 static int finish_automerge(struct commit
*head
,
918 struct commit_list
*common
,
919 struct commit_list
*remoteheads
,
920 struct object_id
*result_tree
,
921 const char *wt_strategy
)
923 struct commit_list
*parents
= NULL
;
924 struct strbuf buf
= STRBUF_INIT
;
925 struct object_id result_commit
;
927 write_tree_trivial(result_tree
);
928 free_commit_list(common
);
929 parents
= remoteheads
;
930 if (!head_subsumed
|| fast_forward
== FF_NO
)
931 commit_list_insert(head
, &parents
);
932 prepare_to_commit(remoteheads
);
933 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
934 &result_commit
, NULL
, sign_commit
))
935 die(_("failed to write commit object"));
936 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
937 finish(head
, remoteheads
, &result_commit
, buf
.buf
);
938 strbuf_release(&buf
);
939 remove_merge_branch_state(the_repository
);
943 static int suggest_conflicts(void)
945 const char *filename
;
947 struct strbuf msgbuf
= STRBUF_INIT
;
949 filename
= git_path_merge_msg(the_repository
);
950 fp
= xfopen(filename
, "a");
953 * We can't use cleanup_mode because if we're not using the editor,
954 * get_cleanup_mode will return COMMIT_MSG_CLEANUP_SPACE instead, even
955 * though the message is meant to be processed later by git-commit.
956 * Thus, we will get the cleanup mode which is returned when we _are_
959 append_conflicts_hint(&the_index
, &msgbuf
,
960 get_cleanup_mode(cleanup_arg
, 1));
961 fputs(msgbuf
.buf
, fp
);
962 strbuf_release(&msgbuf
);
964 repo_rerere(the_repository
, allow_rerere_auto
);
965 printf(_("Automatic merge failed; "
966 "fix conflicts and then commit the result.\n"));
970 static int evaluate_result(void)
975 /* Check how many files differ. */
976 repo_init_revisions(the_repository
, &rev
, "");
977 setup_revisions(0, NULL
, &rev
, NULL
);
978 rev
.diffopt
.output_format
|=
979 DIFF_FORMAT_CALLBACK
;
980 rev
.diffopt
.format_callback
= count_diff_files
;
981 rev
.diffopt
.format_callback_data
= &cnt
;
982 run_diff_files(&rev
, 0);
985 * Check how many unmerged entries are
988 cnt
+= count_unmerged_entries();
994 * Pretend as if the user told us to merge with the remote-tracking
995 * branch we have for the upstream of the current branch
997 static int setup_with_upstream(const char ***argv
)
999 struct branch
*branch
= branch_get(NULL
);
1004 die(_("No current branch."));
1005 if (!branch
->remote_name
)
1006 die(_("No remote for the current branch."));
1007 if (!branch
->merge_nr
)
1008 die(_("No default upstream defined for the current branch."));
1010 args
= xcalloc(st_add(branch
->merge_nr
, 1), sizeof(char *));
1011 for (i
= 0; i
< branch
->merge_nr
; i
++) {
1012 if (!branch
->merge
[i
]->dst
)
1013 die(_("No remote-tracking branch for %s from %s"),
1014 branch
->merge
[i
]->src
, branch
->remote_name
);
1015 args
[i
] = branch
->merge
[i
]->dst
;
1022 static void write_merge_heads(struct commit_list
*remoteheads
)
1024 struct commit_list
*j
;
1025 struct strbuf buf
= STRBUF_INIT
;
1027 for (j
= remoteheads
; j
; j
= j
->next
) {
1028 struct object_id
*oid
;
1029 struct commit
*c
= j
->item
;
1030 struct merge_remote_desc
*desc
;
1032 desc
= merge_remote_util(c
);
1033 if (desc
&& desc
->obj
) {
1034 oid
= &desc
->obj
->oid
;
1036 oid
= &c
->object
.oid
;
1038 strbuf_addf(&buf
, "%s\n", oid_to_hex(oid
));
1040 write_file_buf(git_path_merge_head(the_repository
), buf
.buf
, buf
.len
);
1043 if (fast_forward
== FF_NO
)
1044 strbuf_addstr(&buf
, "no-ff");
1045 write_file_buf(git_path_merge_mode(the_repository
), buf
.buf
, buf
.len
);
1046 strbuf_release(&buf
);
1049 static void write_merge_state(struct commit_list
*remoteheads
)
1051 write_merge_heads(remoteheads
);
1052 strbuf_addch(&merge_msg
, '\n');
1053 write_file_buf(git_path_merge_msg(the_repository
), merge_msg
.buf
,
1057 static int default_edit_option(void)
1059 static const char name
[] = "GIT_MERGE_AUTOEDIT";
1060 const char *e
= getenv(name
);
1061 struct stat st_stdin
, st_stdout
;
1064 /* an explicit -m msg without --[no-]edit */
1068 int v
= git_parse_maybe_bool(e
);
1070 die(_("Bad value '%s' in environment '%s'"), e
, name
);
1074 /* Use editor if stdin and stdout are the same and is a tty */
1075 return (!fstat(0, &st_stdin
) &&
1076 !fstat(1, &st_stdout
) &&
1077 isatty(0) && isatty(1) &&
1078 st_stdin
.st_dev
== st_stdout
.st_dev
&&
1079 st_stdin
.st_ino
== st_stdout
.st_ino
&&
1080 st_stdin
.st_mode
== st_stdout
.st_mode
);
1083 static struct commit_list
*reduce_parents(struct commit
*head_commit
,
1085 struct commit_list
*remoteheads
)
1087 struct commit_list
*parents
, **remotes
;
1090 * Is the current HEAD reachable from another commit being
1091 * merged? If so we do not want to record it as a parent of
1092 * the resulting merge, unless --no-ff is given. We will flip
1093 * this variable to 0 when we find HEAD among the independent
1094 * tips being merged.
1098 /* Find what parents to record by checking independent ones. */
1099 parents
= reduce_heads(remoteheads
);
1100 free_commit_list(remoteheads
);
1103 remotes
= &remoteheads
;
1105 struct commit
*commit
= pop_commit(&parents
);
1106 if (commit
== head_commit
)
1109 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1114 static void prepare_merge_message(struct strbuf
*merge_names
, struct strbuf
*merge_msg
)
1116 struct fmt_merge_msg_opts opts
;
1118 memset(&opts
, 0, sizeof(opts
));
1119 opts
.add_title
= !have_message
;
1120 opts
.shortlog_len
= shortlog_len
;
1121 opts
.credit_people
= (0 < option_edit
);
1123 fmt_merge_msg(merge_names
, merge_msg
, &opts
);
1125 strbuf_setlen(merge_msg
, merge_msg
->len
- 1);
1128 static void handle_fetch_head(struct commit_list
**remotes
, struct strbuf
*merge_names
)
1130 const char *filename
;
1132 struct strbuf fetch_head_file
= STRBUF_INIT
;
1133 const unsigned hexsz
= the_hash_algo
->hexsz
;
1136 merge_names
= &fetch_head_file
;
1138 filename
= git_path_fetch_head(the_repository
);
1139 fd
= xopen(filename
, O_RDONLY
);
1141 if (strbuf_read(merge_names
, fd
, 0) < 0)
1142 die_errno(_("could not read '%s'"), filename
);
1144 die_errno(_("could not close '%s'"), filename
);
1146 for (pos
= 0; pos
< merge_names
->len
; pos
= npos
) {
1147 struct object_id oid
;
1149 struct commit
*commit
;
1151 ptr
= strchr(merge_names
->buf
+ pos
, '\n');
1153 npos
= ptr
- merge_names
->buf
+ 1;
1155 npos
= merge_names
->len
;
1157 if (npos
- pos
< hexsz
+ 2 ||
1158 get_oid_hex(merge_names
->buf
+ pos
, &oid
))
1159 commit
= NULL
; /* bad */
1160 else if (memcmp(merge_names
->buf
+ pos
+ hexsz
, "\t\t", 2))
1161 continue; /* not-for-merge */
1163 char saved
= merge_names
->buf
[pos
+ hexsz
];
1164 merge_names
->buf
[pos
+ hexsz
] = '\0';
1165 commit
= get_merge_parent(merge_names
->buf
+ pos
);
1166 merge_names
->buf
[pos
+ hexsz
] = saved
;
1171 die(_("not something we can merge in %s: %s"),
1172 filename
, merge_names
->buf
+ pos
);
1174 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1177 if (merge_names
== &fetch_head_file
)
1178 strbuf_release(&fetch_head_file
);
1181 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1183 int argc
, const char **argv
,
1184 struct strbuf
*merge_msg
)
1187 struct commit_list
*remoteheads
= NULL
;
1188 struct commit_list
**remotes
= &remoteheads
;
1189 struct strbuf merge_names
= STRBUF_INIT
, *autogen
= NULL
;
1191 if (merge_msg
&& (!have_message
|| shortlog_len
))
1192 autogen
= &merge_names
;
1195 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1197 if (argc
== 1 && !strcmp(argv
[0], "FETCH_HEAD")) {
1198 handle_fetch_head(remotes
, autogen
);
1199 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1201 for (i
= 0; i
< argc
; i
++) {
1202 struct commit
*commit
= get_merge_parent(argv
[i
]);
1204 help_unknown_ref(argv
[i
], "merge",
1205 _("not something we can merge"));
1206 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1208 remoteheads
= reduce_parents(head_commit
, head_subsumed
, remoteheads
);
1210 struct commit_list
*p
;
1211 for (p
= remoteheads
; p
; p
= p
->next
)
1212 merge_name(merge_remote_util(p
->item
)->name
, autogen
);
1217 prepare_merge_message(autogen
, merge_msg
);
1218 strbuf_release(autogen
);
1224 static int merging_a_throwaway_tag(struct commit
*commit
)
1227 struct object_id oid
;
1228 int is_throwaway_tag
= 0;
1230 /* Are we merging a tag? */
1231 if (!merge_remote_util(commit
) ||
1232 !merge_remote_util(commit
)->obj
||
1233 merge_remote_util(commit
)->obj
->type
!= OBJ_TAG
)
1234 return is_throwaway_tag
;
1237 * Now we know we are merging a tag object. Are we downstream
1238 * and following the tags from upstream? If so, we must have
1239 * the tag object pointed at by "refs/tags/$T" where $T is the
1240 * tagname recorded in the tag object. We want to allow such
1241 * a "just to catch up" merge to fast-forward.
1243 * Otherwise, we are playing an integrator's role, making a
1244 * merge with a throw-away tag from a contributor with
1245 * something like "git pull $contributor $signed_tag".
1246 * We want to forbid such a merge from fast-forwarding
1247 * by default; otherwise we would not keep the signature
1250 tag_ref
= xstrfmt("refs/tags/%s",
1251 ((struct tag
*)merge_remote_util(commit
)->obj
)->tag
);
1252 if (!read_ref(tag_ref
, &oid
) &&
1253 oideq(&oid
, &merge_remote_util(commit
)->obj
->oid
))
1254 is_throwaway_tag
= 0;
1256 is_throwaway_tag
= 1;
1258 return is_throwaway_tag
;
1261 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1263 struct object_id result_tree
, stash
, head_oid
;
1264 struct commit
*head_commit
;
1265 struct strbuf buf
= STRBUF_INIT
;
1266 int i
, ret
= 0, head_subsumed
;
1267 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1268 struct commit_list
*common
= NULL
;
1269 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1270 struct commit_list
*remoteheads
, *p
;
1271 void *branch_to_free
;
1272 int orig_argc
= argc
;
1274 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1275 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1278 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1281 branch
= branch_to_free
= resolve_refdup("HEAD", 0, &head_oid
, NULL
);
1283 skip_prefix(branch
, "refs/heads/", &branch
);
1285 if (!pull_twohead
) {
1286 char *default_strategy
= getenv("GIT_TEST_MERGE_ALGORITHM");
1287 if (default_strategy
&& !strcmp(default_strategy
, "ort"))
1288 pull_twohead
= "ort";
1291 init_diff_ui_defaults();
1292 git_config(git_merge_config
, NULL
);
1294 if (!branch
|| is_null_oid(&head_oid
))
1297 head_commit
= lookup_commit_or_die(&head_oid
, "HEAD");
1299 if (branch_mergeoptions
)
1300 parse_branch_merge_options(branch_mergeoptions
);
1301 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1302 builtin_merge_usage
, 0);
1303 if (shortlog_len
< 0)
1304 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1306 if (verbosity
< 0 && show_progress
== -1)
1309 if (abort_current_merge
) {
1311 const char *nargv
[] = {"reset", "--merge", NULL
};
1312 struct strbuf stash_oid
= STRBUF_INIT
;
1315 usage_msg_opt(_("--abort expects no arguments"),
1316 builtin_merge_usage
, builtin_merge_options
);
1318 if (!file_exists(git_path_merge_head(the_repository
)))
1319 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1321 if (read_oneliner(&stash_oid
, git_path_merge_autostash(the_repository
),
1322 READ_ONELINER_SKIP_IF_EMPTY
))
1323 unlink(git_path_merge_autostash(the_repository
));
1325 /* Invoke 'git reset --merge' */
1326 ret
= cmd_reset(nargc
, nargv
, prefix
);
1329 apply_autostash_oid(stash_oid
.buf
);
1331 strbuf_release(&stash_oid
);
1335 if (quit_current_merge
) {
1337 usage_msg_opt(_("--quit expects no arguments"),
1338 builtin_merge_usage
,
1339 builtin_merge_options
);
1341 remove_merge_branch_state(the_repository
);
1345 if (continue_current_merge
) {
1347 const char *nargv
[] = {"commit", NULL
};
1350 usage_msg_opt(_("--continue expects no arguments"),
1351 builtin_merge_usage
, builtin_merge_options
);
1353 if (!file_exists(git_path_merge_head(the_repository
)))
1354 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1356 /* Invoke 'git commit' */
1357 ret
= cmd_commit(nargc
, nargv
, prefix
);
1361 if (read_cache_unmerged())
1362 die_resolve_conflict("merge");
1364 if (file_exists(git_path_merge_head(the_repository
))) {
1366 * There is no unmerged entry, don't advise 'git
1367 * add/rm <file>', just 'git commit'.
1369 if (advice_resolve_conflict
)
1370 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1371 "Please, commit your changes before you merge."));
1373 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1375 if (ref_exists("CHERRY_PICK_HEAD")) {
1376 if (advice_resolve_conflict
)
1377 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1378 "Please, commit your changes before you merge."));
1380 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1382 resolve_undo_clear();
1384 if (option_edit
< 0)
1385 option_edit
= default_edit_option();
1387 cleanup_mode
= get_cleanup_mode(cleanup_arg
, 0 < option_edit
);
1393 if (fast_forward
== FF_NO
)
1394 die(_("You cannot combine --squash with --no-ff."));
1395 if (option_commit
> 0)
1396 die(_("You cannot combine --squash with --commit."));
1398 * squash can now silently disable option_commit - this is not
1399 * a problem as it is only overriding the default, not a user
1405 if (option_commit
< 0)
1409 if (default_to_upstream
)
1410 argc
= setup_with_upstream(&argv
);
1412 die(_("No commit specified and merge.defaultToUpstream not set."));
1413 } else if (argc
== 1 && !strcmp(argv
[0], "-")) {
1418 usage_with_options(builtin_merge_usage
,
1419 builtin_merge_options
);
1423 * If the merged head is a valid one there is no reason
1424 * to forbid "git merge" into a branch yet to be born.
1425 * We do the same for "git pull".
1427 struct object_id
*remote_head_oid
;
1429 die(_("Squash commit into empty head not supported yet"));
1430 if (fast_forward
== FF_NO
)
1431 die(_("Non-fast-forward commit does not make sense into "
1433 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1436 die(_("%s - not something we can merge"), argv
[0]);
1437 if (remoteheads
->next
)
1438 die(_("Can merge only exactly one commit into empty head"));
1440 if (verify_signatures
)
1441 verify_merge_signature(remoteheads
->item
, verbosity
,
1444 remote_head_oid
= &remoteheads
->item
->object
.oid
;
1445 read_empty(remote_head_oid
, 0);
1446 update_ref("initial pull", "HEAD", remote_head_oid
, NULL
, 0,
1447 UPDATE_REFS_DIE_ON_ERR
);
1452 * All the rest are the commits being merged; prepare
1453 * the standard merge summary message to be appended
1454 * to the given message.
1456 remoteheads
= collect_parents(head_commit
, &head_subsumed
,
1457 argc
, argv
, &merge_msg
);
1459 if (!head_commit
|| !argc
)
1460 usage_with_options(builtin_merge_usage
,
1461 builtin_merge_options
);
1463 if (verify_signatures
) {
1464 for (p
= remoteheads
; p
; p
= p
->next
) {
1465 verify_merge_signature(p
->item
, verbosity
,
1470 strbuf_addstr(&buf
, "merge");
1471 for (p
= remoteheads
; p
; p
= p
->next
)
1472 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1473 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1476 for (p
= remoteheads
; p
; p
= p
->next
) {
1477 struct commit
*commit
= p
->item
;
1478 strbuf_addf(&buf
, "GITHEAD_%s",
1479 oid_to_hex(&commit
->object
.oid
));
1480 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1482 if (fast_forward
!= FF_ONLY
&& merging_a_throwaway_tag(commit
))
1483 fast_forward
= FF_NO
;
1486 if (!use_strategies
) {
1488 ; /* already up-to-date */
1489 else if (!remoteheads
->next
)
1490 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1492 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1495 for (i
= 0; i
< use_strategies_nr
; i
++) {
1496 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1497 fast_forward
= FF_NO
;
1498 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1503 ; /* already up-to-date */
1504 else if (!remoteheads
->next
)
1505 common
= get_merge_bases(head_commit
, remoteheads
->item
);
1507 struct commit_list
*list
= remoteheads
;
1508 commit_list_insert(head_commit
, &list
);
1509 common
= get_octopus_merge_bases(list
);
1513 update_ref("updating ORIG_HEAD", "ORIG_HEAD",
1514 &head_commit
->object
.oid
, NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1516 if (remoteheads
&& !common
) {
1517 /* No common ancestors found. */
1518 if (!allow_unrelated_histories
)
1519 die(_("refusing to merge unrelated histories"));
1520 /* otherwise, we need a real merge. */
1521 } else if (!remoteheads
||
1522 (!remoteheads
->next
&& !common
->next
&&
1523 common
->item
== remoteheads
->item
)) {
1525 * If head can reach all the merge then we are up to date.
1526 * but first the most common case of merging one remote.
1528 finish_up_to_date();
1530 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1532 oideq(&common
->item
->object
.oid
, &head_commit
->object
.oid
)) {
1533 /* Again the most common case of merging one remote. */
1534 struct strbuf msg
= STRBUF_INIT
;
1535 struct commit
*commit
;
1537 if (verbosity
>= 0) {
1538 printf(_("Updating %s..%s\n"),
1539 find_unique_abbrev(&head_commit
->object
.oid
,
1541 find_unique_abbrev(&remoteheads
->item
->object
.oid
,
1544 strbuf_addstr(&msg
, "Fast-forward");
1547 " (no commit created; -m option ignored)");
1548 commit
= remoteheads
->item
;
1555 create_autostash(the_repository
,
1556 git_path_merge_autostash(the_repository
),
1558 if (checkout_fast_forward(the_repository
,
1559 &head_commit
->object
.oid
,
1560 &commit
->object
.oid
,
1561 overwrite_ignore
)) {
1562 apply_autostash(git_path_merge_autostash(the_repository
));
1567 finish(head_commit
, remoteheads
, &commit
->object
.oid
, msg
.buf
);
1568 remove_merge_branch_state(the_repository
);
1570 } else if (!remoteheads
->next
&& common
->next
)
1573 * We are not doing octopus and not fast-forward. Need
1576 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1578 * We are not doing octopus, not fast-forward, and have
1581 refresh_cache(REFRESH_QUIET
);
1582 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1583 /* See if it is really trivial. */
1584 git_committer_info(IDENT_STRICT
);
1585 printf(_("Trying really trivial in-index merge...\n"));
1586 if (!read_tree_trivial(&common
->item
->object
.oid
,
1587 &head_commit
->object
.oid
,
1588 &remoteheads
->item
->object
.oid
)) {
1589 ret
= merge_trivial(head_commit
, remoteheads
);
1592 printf(_("Nope.\n"));
1596 * An octopus. If we can reach all the remote we are up
1600 struct commit_list
*j
;
1602 for (j
= remoteheads
; j
; j
= j
->next
) {
1603 struct commit_list
*common_one
;
1606 * Here we *have* to calculate the individual
1607 * merge_bases again, otherwise "git merge HEAD^
1608 * HEAD^^" would be missed.
1610 common_one
= get_merge_bases(head_commit
, j
->item
);
1611 if (!oideq(&common_one
->item
->object
.oid
, &j
->item
->object
.oid
)) {
1617 finish_up_to_date();
1622 if (fast_forward
== FF_ONLY
)
1623 die(_("Not possible to fast-forward, aborting."));
1626 create_autostash(the_repository
,
1627 git_path_merge_autostash(the_repository
),
1630 /* We are going to make a new commit. */
1631 git_committer_info(IDENT_STRICT
);
1634 * At this point, we need a real merge. No matter what strategy
1635 * we use, it would operate on the index, possibly affecting the
1636 * working tree, and when resolved cleanly, have the desired
1637 * tree in the index -- this means that the index must be in
1638 * sync with the head commit. The strategies are responsible
1641 if (use_strategies_nr
== 1 ||
1643 * Stash away the local changes so that we can try more than one.
1648 for (i
= 0; !merge_was_ok
&& i
< use_strategies_nr
; i
++) {
1651 printf(_("Rewinding the tree to pristine...\n"));
1652 restore_state(&head_commit
->object
.oid
, &stash
);
1654 if (use_strategies_nr
!= 1)
1655 printf(_("Trying merge strategy %s...\n"),
1656 use_strategies
[i
]->name
);
1658 * Remember which strategy left the state in the working
1661 wt_strategy
= use_strategies
[i
]->name
;
1663 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1664 common
, remoteheads
,
1667 * The backend exits with 1 when conflicts are
1668 * left to be resolved, with 2 when it does not
1669 * handle the given merge at all.
1673 if (option_commit
) {
1674 /* Automerge succeeded. */
1675 automerge_was_ok
= 1;
1680 cnt
= (use_strategies_nr
> 1) ? evaluate_result() : 0;
1681 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1682 best_strategy
= use_strategies
[i
]->name
;
1689 * If we have a resulting tree, that means the strategy module
1690 * auto resolved the merge cleanly.
1692 if (automerge_was_ok
) {
1693 ret
= finish_automerge(head_commit
, head_subsumed
,
1694 common
, remoteheads
,
1695 &result_tree
, wt_strategy
);
1700 * Pick the result from the best strategy and have the user fix
1703 if (!best_strategy
) {
1704 restore_state(&head_commit
->object
.oid
, &stash
);
1705 if (use_strategies_nr
> 1)
1707 _("No merge strategy handled the merge.\n"));
1709 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1710 use_strategies
[0]->name
);
1711 apply_autostash(git_path_merge_autostash(the_repository
));
1714 } else if (best_strategy
== wt_strategy
)
1715 ; /* We already have its result in the working tree. */
1717 printf(_("Rewinding the tree to pristine...\n"));
1718 restore_state(&head_commit
->object
.oid
, &stash
);
1719 printf(_("Using the %s strategy to prepare resolving by hand.\n"),
1721 try_merge_strategy(best_strategy
, common
, remoteheads
,
1726 finish(head_commit
, remoteheads
, NULL
, NULL
);
1728 git_test_write_commit_graph_or_die();
1730 write_merge_state(remoteheads
);
1733 fprintf(stderr
, _("Automatic merge went well; "
1734 "stopped before committing as requested\n"));
1736 ret
= suggest_conflicts();
1739 free(branch_to_free
);