Update messages in preparation for i18n
[git/git.git] / builtin / merge.c
CommitLineData
1c7b76be
MV
1/*
2 * Builtin "git merge"
3 *
4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
5 *
6 * Based on git-merge.sh by Junio C Hamano.
7 */
8
9#include "cache.h"
b2141fc1 10#include "config.h"
1c7b76be
MV
11#include "parse-options.h"
12#include "builtin.h"
697cc8ef 13#include "lockfile.h"
1c7b76be
MV
14#include "run-command.h"
15#include "diff.h"
16#include "refs.h"
ec0cb496 17#include "refspec.h"
1c7b76be
MV
18#include "commit.h"
19#include "diffcore.h"
20#include "revision.h"
21#include "unpack-trees.h"
22#include "cache-tree.h"
23#include "dir.h"
24#include "utf8.h"
25#include "log-tree.h"
26#include "color.h"
fcab40a3 27#include "rerere.h"
87091b49 28#include "help.h"
18668f53 29#include "merge-recursive.h"
cfc5789a 30#include "resolve-undo.h"
93e535a5 31#include "remote.h"
898eacd8 32#include "fmt-merge-msg.h"
ba3c69a9 33#include "gpg-interface.h"
75c961b7 34#include "sequencer.h"
02a8cfa4 35#include "string-list.h"
3836d88a 36#include "packfile.h"
adcc94a0 37#include "tag.h"
65b5f948 38#include "alias.h"
1c7b76be
MV
39
40#define DEFAULT_TWOHEAD (1<<0)
41#define DEFAULT_OCTOPUS (1<<1)
42#define NO_FAST_FORWARD (1<<2)
43#define NO_TRIVIAL (1<<3)
44
45struct strategy {
46 const char *name;
47 unsigned attr;
48};
49
50static const char * const builtin_merge_usage[] = {
9c9b4f2f 51 N_("git merge [<options>] [<commit>...]"),
962e6295 52 N_("git merge --abort"),
367ff694 53 N_("git merge --continue"),
1c7b76be
MV
54 NULL
55};
56
898eacd8 57static int show_diffstat = 1, shortlog_len = -1, squash;
a54841e9
MV
58static int option_commit = 1;
59static int option_edit = -1;
efed0022 60static int allow_trivial = 1, have_message, verify_signatures;
c1d7036b 61static int overwrite_ignore = 1;
2c47789d 62static struct strbuf merge_msg = STRBUF_INIT;
1c7b76be
MV
63static struct strategy **use_strategies;
64static size_t use_strategies_nr, use_strategies_alloc;
8cc5b290
AP
65static const char **xopts;
66static size_t xopts_nr, xopts_alloc;
1c7b76be 67static const char *branch;
0d8fc3ef 68static char *branch_mergeoptions;
7610fa57 69static int option_renormalize;
7f87aff2 70static int verbosity;
cb6020bb 71static int allow_rerere_auto;
35d2fffd 72static int abort_current_merge;
367ff694 73static int continue_current_merge;
e379fdf3 74static int allow_unrelated_histories;
99bfc669 75static int show_progress = -1;
a01f7f2b 76static int default_to_upstream = 1;
14d01b4f 77static int signoff;
ba3c69a9 78static const char *sign_commit;
f8b86359 79static int verify_msg = 1;
1c7b76be
MV
80
81static struct strategy all_strategy[] = {
1c7b76be
MV
82 { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
83 { "octopus", DEFAULT_OCTOPUS },
84 { "resolve", 0 },
1c7b76be
MV
85 { "ours", NO_FAST_FORWARD | NO_TRIVIAL },
86 { "subtree", NO_FAST_FORWARD | NO_TRIVIAL },
87};
88
89static const char *pull_twohead, *pull_octopus;
90
a54841e9
MV
91enum ff_type {
92 FF_NO,
93 FF_ALLOW,
94 FF_ONLY
95};
96
97static enum ff_type fast_forward = FF_ALLOW;
98
1c7b76be
MV
99static int option_parse_message(const struct option *opt,
100 const char *arg, int unset)
101{
102 struct strbuf *buf = opt->value;
103
104 if (unset)
105 strbuf_setlen(buf, 0);
74f5b7fb 106 else if (arg) {
ce9d823b 107 strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg);
1c7b76be 108 have_message = 1;
74f5b7fb 109 } else
bacec478 110 return error(_("switch `m' requires a value"));
1c7b76be
MV
111 return 0;
112}
113
114static struct strategy *get_strategy(const char *name)
115{
116 int i;
87091b49
MV
117 struct strategy *ret;
118 static struct cmdnames main_cmds, other_cmds;
e321180e 119 static int loaded;
1c7b76be
MV
120
121 if (!name)
122 return NULL;
123
124 for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
125 if (!strcmp(name, all_strategy[i].name))
126 return &all_strategy[i];
1719b5e4 127
e321180e 128 if (!loaded) {
87091b49 129 struct cmdnames not_strategies;
e321180e 130 loaded = 1;
87091b49 131
87091b49 132 memset(&not_strategies, 0, sizeof(struct cmdnames));
e321180e 133 load_command_list("git-merge-", &main_cmds, &other_cmds);
87091b49
MV
134 for (i = 0; i < main_cmds.cnt; i++) {
135 int j, found = 0;
136 struct cmdname *ent = main_cmds.names[i];
137 for (j = 0; j < ARRAY_SIZE(all_strategy); j++)
138 if (!strncmp(ent->name, all_strategy[j].name, ent->len)
139 && !all_strategy[j].name[ent->len])
140 found = 1;
141 if (!found)
142 add_cmdname(&not_strategies, ent->name, ent->len);
87091b49 143 }
ed874656 144 exclude_cmds(&main_cmds, &not_strategies);
87091b49
MV
145 }
146 if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
bacec478
ÆAB
147 fprintf(stderr, _("Could not find merge strategy '%s'.\n"), name);
148 fprintf(stderr, _("Available strategies are:"));
131f9a10
JH
149 for (i = 0; i < main_cmds.cnt; i++)
150 fprintf(stderr, " %s", main_cmds.names[i]->name);
151 fprintf(stderr, ".\n");
152 if (other_cmds.cnt) {
bacec478 153 fprintf(stderr, _("Available custom strategies are:"));
131f9a10
JH
154 for (i = 0; i < other_cmds.cnt; i++)
155 fprintf(stderr, " %s", other_cmds.names[i]->name);
156 fprintf(stderr, ".\n");
157 }
87091b49
MV
158 exit(1);
159 }
160
19d4b416 161 ret = xcalloc(1, sizeof(struct strategy));
87091b49 162 ret->name = xstrdup(name);
52b48ef1 163 ret->attr = NO_TRIVIAL;
87091b49 164 return ret;
1c7b76be
MV
165}
166
167static void append_strategy(struct strategy *s)
168{
169 ALLOC_GROW(use_strategies, use_strategies_nr + 1, use_strategies_alloc);
170 use_strategies[use_strategies_nr++] = s;
171}
172
173static int option_parse_strategy(const struct option *opt,
174 const char *name, int unset)
175{
1c7b76be
MV
176 if (unset)
177 return 0;
178
1719b5e4 179 append_strategy(get_strategy(name));
1c7b76be
MV
180 return 0;
181}
182
8cc5b290
AP
183static int option_parse_x(const struct option *opt,
184 const char *arg, int unset)
185{
186 if (unset)
187 return 0;
188
189 ALLOC_GROW(xopts, xopts_nr + 1, xopts_alloc);
190 xopts[xopts_nr++] = xstrdup(arg);
191 return 0;
192}
193
1c7b76be
MV
194static int option_parse_n(const struct option *opt,
195 const char *arg, int unset)
196{
197 show_diffstat = unset;
198 return 0;
199}
200
201static struct option builtin_merge_options[] = {
202 { OPTION_CALLBACK, 'n', NULL, NULL, NULL,
962e6295 203 N_("do not show a diffstat at the end of the merge"),
1c7b76be 204 PARSE_OPT_NOARG, option_parse_n },
d5d09d47 205 OPT_BOOL(0, "stat", &show_diffstat,
962e6295 206 N_("show a diffstat at the end of the merge")),
d5d09d47 207 OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
962e6295
NTND
208 { OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
209 N_("add (at most <n>) entries from shortlog to merge commit message"),
96e9420c 210 PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
d5d09d47 211 OPT_BOOL(0, "squash", &squash,
962e6295 212 N_("create a single commit instead of doing a merge")),
d5d09d47 213 OPT_BOOL(0, "commit", &option_commit,
962e6295 214 N_("perform a commit if the merge succeeds (default)")),
f8246281 215 OPT_BOOL('e', "edit", &option_edit,
962e6295 216 N_("edit message before committing")),
a54841e9 217 OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW),
3e4a67b4
NTND
218 OPT_SET_INT_F(0, "ff-only", &fast_forward,
219 N_("abort if fast-forward is not possible"),
220 FF_ONLY, PARSE_OPT_NONEG),
cb6020bb 221 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
efed0022 222 OPT_BOOL(0, "verify-signatures", &verify_signatures,
c8bb9d2e 223 N_("verify that the named commit has a valid GPG signature")),
962e6295
NTND
224 OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
225 N_("merge strategy to use"), option_parse_strategy),
226 OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),
227 N_("option for selected merge strategy"), option_parse_x),
228 OPT_CALLBACK('m', "message", &merge_msg, N_("message"),
229 N_("merge commit message (for a non-fast-forward merge)"),
1c7b76be 230 option_parse_message),
7f87aff2 231 OPT__VERBOSITY(&verbosity),
d5d09d47 232 OPT_BOOL(0, "abort", &abort_current_merge,
962e6295 233 N_("abort the current in-progress merge")),
367ff694
CP
234 OPT_BOOL(0, "continue", &continue_current_merge,
235 N_("continue the current in-progress merge")),
e379fdf3
JH
236 OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
237 N_("allow merging unrelated histories")),
962e6295 238 OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
e703d711 239 { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
962e6295 240 N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
d5d09d47 241 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
14d01b4f 242 OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
f8b86359 243 OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
1c7b76be
MV
244 OPT_END()
245};
246
247/* Cleans up metadata that is uninteresting after a succeeded merge. */
248static void drop_save(void)
249{
f932729c
JK
250 unlink(git_path_merge_head());
251 unlink(git_path_merge_msg());
252 unlink(git_path_merge_mode());
1c7b76be
MV
253}
254
52684310 255static int save_state(struct object_id *stash)
1c7b76be
MV
256{
257 int len;
d3180279 258 struct child_process cp = CHILD_PROCESS_INIT;
1c7b76be
MV
259 struct strbuf buffer = STRBUF_INIT;
260 const char *argv[] = {"stash", "create", NULL};
150888e2 261 int rc = -1;
1c7b76be 262
1c7b76be
MV
263 cp.argv = argv;
264 cp.out = -1;
265 cp.git_cmd = 1;
266
267 if (start_command(&cp))
bacec478 268 die(_("could not run stash."));
1c7b76be
MV
269 len = strbuf_read(&buffer, cp.out, 1024);
270 close(cp.out);
271
272 if (finish_command(&cp) || len < 0)
bacec478 273 die(_("stash failed"));
b4fd9406 274 else if (!len) /* no changes */
150888e2 275 goto out;
1c7b76be 276 strbuf_setlen(&buffer, buffer.len-1);
52684310 277 if (get_oid(buffer.buf, stash))
bacec478 278 die(_("not a valid object: %s"), buffer.buf);
150888e2
RS
279 rc = 0;
280out:
281 strbuf_release(&buffer);
282 return rc;
1c7b76be
MV
283}
284
cb91022c 285static void read_empty(const struct object_id *oid, int verbose)
172b6428
CB
286{
287 int i = 0;
288 const char *args[7];
289
290 args[i++] = "read-tree";
291 if (verbose)
292 args[i++] = "-v";
293 args[i++] = "-m";
294 args[i++] = "-u";
cb91022c 295 args[i++] = empty_tree_oid_hex();
296 args[i++] = oid_to_hex(oid);
172b6428
CB
297 args[i] = NULL;
298
299 if (run_command_v_opt(args, RUN_GIT_CMD))
bacec478 300 die(_("read-tree failed"));
172b6428
CB
301}
302
cb91022c 303static void reset_hard(const struct object_id *oid, int verbose)
1c7b76be
MV
304{
305 int i = 0;
306 const char *args[6];
307
308 args[i++] = "read-tree";
309 if (verbose)
310 args[i++] = "-v";
311 args[i++] = "--reset";
312 args[i++] = "-u";
cb91022c 313 args[i++] = oid_to_hex(oid);
1c7b76be
MV
314 args[i] = NULL;
315
316 if (run_command_v_opt(args, RUN_GIT_CMD))
bacec478 317 die(_("read-tree failed"));
1c7b76be
MV
318}
319
52684310 320static void restore_state(const struct object_id *head,
321 const struct object_id *stash)
1c7b76be 322{
f285a2d7 323 struct strbuf sb = STRBUF_INIT;
1c7b76be
MV
324 const char *args[] = { "stash", "apply", NULL, NULL };
325
52684310 326 if (is_null_oid(stash))
1c7b76be
MV
327 return;
328
cb91022c 329 reset_hard(head, 1);
1c7b76be 330
52684310 331 args[2] = oid_to_hex(stash);
1c7b76be
MV
332
333 /*
334 * It is OK to ignore error here, for example when there was
335 * nothing to restore.
336 */
337 run_command_v_opt(args, RUN_GIT_CMD);
338
339 strbuf_release(&sb);
340 refresh_cache(REFRESH_QUIET);
341}
342
343/* This is called when no merge was necessary. */
344static void finish_up_to_date(const char *msg)
345{
7f87aff2 346 if (verbosity >= 0)
bacec478 347 printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
1c7b76be
MV
348 drop_save();
349}
350
4c57bd27 351static void squash_message(struct commit *commit, struct commit_list *remoteheads)
1c7b76be
MV
352{
353 struct rev_info rev;
f285a2d7 354 struct strbuf out = STRBUF_INIT;
1c7b76be 355 struct commit_list *j;
dd2e794a 356 struct pretty_print_context ctx = {0};
1c7b76be 357
bacec478 358 printf(_("Squash commit -- not updating HEAD\n"));
1c7b76be
MV
359
360 init_revisions(&rev, NULL);
361 rev.ignore_merges = 1;
362 rev.commit_format = CMIT_FMT_MEDIUM;
363
1c7b76be
MV
364 commit->object.flags |= UNINTERESTING;
365 add_pending_object(&rev, &commit->object, NULL);
366
367 for (j = remoteheads; j; j = j->next)
368 add_pending_object(&rev, &j->item->object, NULL);
369
370 setup_revisions(0, NULL, &rev, NULL);
371 if (prepare_revision_walk(&rev))
bacec478 372 die(_("revision walk setup failed"));
1c7b76be 373
dd2e794a
TR
374 ctx.abbrev = rev.abbrev;
375 ctx.date_mode = rev.date_mode;
6bf13944 376 ctx.fmt = rev.commit_format;
dd2e794a 377
1c7b76be
MV
378 strbuf_addstr(&out, "Squashed commit of the following:\n");
379 while ((commit = get_revision(&rev)) != NULL) {
380 strbuf_addch(&out, '\n');
381 strbuf_addf(&out, "commit %s\n",
f2fd0760 382 oid_to_hex(&commit->object.oid));
6bf13944 383 pretty_print_commit(&ctx, commit, &out);
1c7b76be 384 }
e78d5d49 385 write_file_buf(git_path_squash_msg(), out.buf, out.len);
1c7b76be
MV
386 strbuf_release(&out);
387}
388
894642f6 389static void finish(struct commit *head_commit,
4c57bd27 390 struct commit_list *remoteheads,
52684310 391 const struct object_id *new_head, const char *msg)
1c7b76be 392{
f285a2d7 393 struct strbuf reflog_message = STRBUF_INIT;
52684310 394 const struct object_id *head = &head_commit->object.oid;
1c7b76be 395
1c7b76be
MV
396 if (!msg)
397 strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION"));
398 else {
7f87aff2
TA
399 if (verbosity >= 0)
400 printf("%s\n", msg);
1c7b76be
MV
401 strbuf_addf(&reflog_message, "%s: %s",
402 getenv("GIT_REFLOG_ACTION"), msg);
403 }
404 if (squash) {
4c57bd27 405 squash_message(head_commit, remoteheads);
1c7b76be 406 } else {
7f87aff2 407 if (verbosity >= 0 && !merge_msg.len)
bacec478 408 printf(_("No merge message -- not updating HEAD\n"));
1c7b76be
MV
409 else {
410 const char *argv_gc_auto[] = { "gc", "--auto", NULL };
ae077771 411 update_ref(reflog_message.buf, "HEAD", new_head, head,
412 0, UPDATE_REFS_DIE_ON_ERR);
1c7b76be
MV
413 /*
414 * We ignore errors in 'gc --auto', since the
415 * user should see them.
416 */
d0b59866 417 close_all_packs(the_repository->objects);
1c7b76be
MV
418 run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
419 }
420 }
421 if (new_head && show_diffstat) {
422 struct diff_options opts;
423 diff_setup(&opts);
7a7159ac 424 opts.stat_width = -1; /* use full terminal width */
df44483a 425 opts.stat_graph_width = -1; /* respect statGraphWidth config */
1c7b76be
MV
426 opts.output_format |=
427 DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
428 opts.detect_rename = DIFF_DETECT_RENAME;
28452655 429 diff_setup_done(&opts);
66f414f8 430 diff_tree_oid(head, new_head, "", &opts);
1c7b76be
MV
431 diffcore_std(&opts);
432 diff_flush(&opts);
433 }
434
435 /* Run a post-merge hook */
15048f8a 436 run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
1c7b76be
MV
437
438 strbuf_release(&reflog_message);
439}
440
441/* Get the name for the merge commit's message. */
442static void merge_name(const char *remote, struct strbuf *msg)
443{
ae8e4c9c 444 struct commit *remote_head;
52684310 445 struct object_id branch_head;
f285a2d7 446 struct strbuf buf = STRBUF_INIT;
c9717ee9 447 struct strbuf bname = STRBUF_INIT;
e2e5ac23 448 struct merge_remote_desc *desc;
1c7b76be 449 const char *ptr;
751c5974 450 char *found_ref;
1c7b76be
MV
451 int len, early;
452
0e9f62da 453 strbuf_branchname(&bname, remote, 0);
a552de75 454 remote = bname.buf;
c9717ee9 455
52684310 456 oidclr(&branch_head);
ae8e4c9c 457 remote_head = get_merge_parent(remote);
1c7b76be 458 if (!remote_head)
bacec478 459 die(_("'%s' does not point to a commit"), remote);
1c7b76be 460
cca5fa64 461 if (dwim_ref(remote, strlen(remote), &branch_head, &found_ref) > 0) {
59556548 462 if (starts_with(found_ref, "refs/heads/")) {
751c5974 463 strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
52684310 464 oid_to_hex(&branch_head), remote);
751c5974
JK
465 goto cleanup;
466 }
59556548 467 if (starts_with(found_ref, "refs/tags/")) {
57b58db7 468 strbuf_addf(msg, "%s\t\ttag '%s' of .\n",
52684310 469 oid_to_hex(&branch_head), remote);
57b58db7
JH
470 goto cleanup;
471 }
59556548 472 if (starts_with(found_ref, "refs/remotes/")) {
13931236 473 strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
52684310 474 oid_to_hex(&branch_head), remote);
69a8b7c7
JK
475 goto cleanup;
476 }
1c7b76be
MV
477 }
478
479 /* See if remote matches <name>^^^.. or <name>~<number> */
480 for (len = 0, ptr = remote + strlen(remote);
481 remote < ptr && ptr[-1] == '^';
482 ptr--)
483 len++;
484 if (len)
485 early = 1;
486 else {
487 early = 0;
488 ptr = strrchr(remote, '~');
489 if (ptr) {
490 int seen_nonzero = 0;
491
492 len++; /* count ~ */
493 while (*++ptr && isdigit(*ptr)) {
494 seen_nonzero |= (*ptr != '0');
495 len++;
496 }
497 if (*ptr)
498 len = 0; /* not ...~<number> */
499 else if (seen_nonzero)
500 early = 1;
501 else if (len == 1)
502 early = 1; /* "name~" is "name~1"! */
503 }
504 }
505 if (len) {
506 struct strbuf truname = STRBUF_INIT;
1016658d 507 strbuf_addf(&truname, "refs/heads/%s", remote);
9b6bf4d5 508 strbuf_setlen(&truname, truname.len - len);
c6893323 509 if (ref_exists(truname.buf)) {
1c7b76be
MV
510 strbuf_addf(msg,
511 "%s\t\tbranch '%s'%s of .\n",
c368dde9 512 oid_to_hex(&remote_head->object.oid),
9b6bf4d5 513 truname.buf + 11,
1c7b76be 514 (early ? " (early part)" : ""));
c9717ee9
JH
515 strbuf_release(&truname);
516 goto cleanup;
1c7b76be 517 }
1016658d 518 strbuf_release(&truname);
1c7b76be 519 }
2d1495fe 520
e2e5ac23
NTND
521 desc = merge_remote_util(remote_head);
522 if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
523 strbuf_addf(msg, "%s\t\t%s '%s'\n",
524 oid_to_hex(&desc->obj->oid),
525 type_name(desc->obj->type),
526 remote);
527 goto cleanup;
2d1495fe
JH
528 }
529
1c7b76be 530 strbuf_addf(msg, "%s\t\tcommit '%s'\n",
c368dde9 531 oid_to_hex(&remote_head->object.oid), remote);
c9717ee9
JH
532cleanup:
533 strbuf_release(&buf);
534 strbuf_release(&bname);
1c7b76be
MV
535}
536
0d8fc3ef
JH
537static void parse_branch_merge_options(char *bmo)
538{
539 const char **argv;
540 int argc;
541
542 if (!bmo)
543 return;
544 argc = split_cmdline(bmo, &argv);
545 if (argc < 0)
c7fe5b61
JH
546 die(_("Bad branch.%s.mergeoptions string: %s"), branch,
547 split_cmdline_strerror(argc));
2756ca43 548 REALLOC_ARRAY(argv, argc + 2);
f331ab9d 549 MOVE_ARRAY(argv + 1, argv, argc + 1);
0d8fc3ef
JH
550 argc++;
551 argv[0] = "branch.*.mergeoptions";
552 parse_options(argc, argv, NULL, builtin_merge_options,
553 builtin_merge_usage, 0);
554 free(argv);
555}
556
186458b1 557static int git_merge_config(const char *k, const char *v, void *cb)
1c7b76be 558{
898eacd8
JH
559 int status;
560
59556548
CC
561 if (branch && starts_with(k, "branch.") &&
562 starts_with(k + 7, branch) &&
1c7b76be 563 !strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
0d8fc3ef
JH
564 free(branch_mergeoptions);
565 branch_mergeoptions = xstrdup(v);
566 return 0;
1c7b76be
MV
567 }
568
569 if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
570 show_diffstat = git_config_bool(k, v);
ca779e82
HJI
571 else if (!strcmp(k, "merge.verifysignatures"))
572 verify_signatures = git_config_bool(k, v);
1c7b76be
MV
573 else if (!strcmp(k, "pull.twohead"))
574 return git_config_string(&pull_twohead, k, v);
575 else if (!strcmp(k, "pull.octopus"))
576 return git_config_string(&pull_octopus, k, v);
7610fa57
JN
577 else if (!strcmp(k, "merge.renormalize"))
578 option_renormalize = git_config_bool(k, v);
898eacd8 579 else if (!strcmp(k, "merge.ff")) {
89576613 580 int boolval = git_parse_maybe_bool(v);
f23e8dec 581 if (0 <= boolval) {
a54841e9 582 fast_forward = boolval ? FF_ALLOW : FF_NO;
f23e8dec 583 } else if (v && !strcmp(v, "only")) {
a54841e9 584 fast_forward = FF_ONLY;
f23e8dec
JH
585 } /* do not barf on values from future versions of git */
586 return 0;
93e535a5
JH
587 } else if (!strcmp(k, "merge.defaulttoupstream")) {
588 default_to_upstream = git_config_bool(k, v);
589 return 0;
d95bfb12
NV
590 } else if (!strcmp(k, "commit.gpgsign")) {
591 sign_commit = git_config_bool(k, v) ? "" : NULL;
592 return 0;
96e9420c 593 }
ba3c69a9 594
898eacd8 595 status = fmt_merge_msg_config(k, v, cb);
5de89d3a
JH
596 if (status)
597 return status;
ba3c69a9 598 status = git_gpg_config(k, v, NULL);
898eacd8
JH
599 if (status)
600 return status;
1c7b76be
MV
601 return git_diff_ui_config(k, v, cb);
602}
603
52684310 604static int read_tree_trivial(struct object_id *common, struct object_id *head,
605 struct object_id *one)
1c7b76be
MV
606{
607 int i, nr_trees = 0;
608 struct tree *trees[MAX_UNPACK_TREES];
609 struct tree_desc t[MAX_UNPACK_TREES];
610 struct unpack_trees_options opts;
611
612 memset(&opts, 0, sizeof(opts));
613 opts.head_idx = 2;
614 opts.src_index = &the_index;
615 opts.dst_index = &the_index;
616 opts.update = 1;
617 opts.verbose_update = 1;
618 opts.trivial_merges_only = 1;
619 opts.merge = 1;
a9dbc179 620 trees[nr_trees] = parse_tree_indirect(common);
1c7b76be
MV
621 if (!trees[nr_trees++])
622 return -1;
a9dbc179 623 trees[nr_trees] = parse_tree_indirect(head);
1c7b76be
MV
624 if (!trees[nr_trees++])
625 return -1;
a9dbc179 626 trees[nr_trees] = parse_tree_indirect(one);
1c7b76be
MV
627 if (!trees[nr_trees++])
628 return -1;
629 opts.fn = threeway_merge;
630 cache_tree_free(&active_cache_tree);
631 for (i = 0; i < nr_trees; i++) {
632 parse_tree(trees[i]);
633 init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
634 }
635 if (unpack_trees(nr_trees, t, &opts))
636 return -1;
637 return 0;
638}
639
52684310 640static void write_tree_trivial(struct object_id *oid)
1c7b76be 641{
fc5cb99f 642 if (write_cache_as_tree(oid, 0, NULL))
bacec478 643 die(_("git write-tree failed to write a tree"));
1c7b76be
MV
644}
645
3f9083cd 646static int try_merge_strategy(const char *strategy, struct commit_list *common,
4c57bd27 647 struct commit_list *remoteheads,
b4391657 648 struct commit *head)
3f9083cd 649{
b2275868 650 struct lock_file lock = LOCK_INIT;
b4391657 651 const char *head_arg = "HEAD";
668f26ff 652
b3e83cc7 653 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
668f26ff 654 refresh_cache(REFRESH_QUIET);
61000814
655 if (write_locked_index(&the_index, &lock,
656 COMMIT_LOCK | SKIP_IF_UNCHANGED))
bacec478 657 return error(_("Unable to write index."));
1c7b76be 658
18668f53 659 if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
3f9083cd 660 int clean, x;
18668f53 661 struct commit *result;
18668f53
MV
662 struct commit_list *reversed = NULL;
663 struct merge_options o;
3f9083cd 664 struct commit_list *j;
18668f53
MV
665
666 if (remoteheads->next) {
bacec478 667 error(_("Not handling anything other than two heads merge."));
18668f53
MV
668 return 2;
669 }
670
671 init_merge_options(&o);
672 if (!strcmp(strategy, "subtree"))
85e51b78 673 o.subtree_shift = "";
8cc5b290 674
7610fa57 675 o.renormalize = option_renormalize;
99bfc669
JK
676 o.show_rename_progress =
677 show_progress == -1 ? isatty(2) : show_progress;
7610fa57 678
635a7bb1
JN
679 for (x = 0; x < xopts_nr; x++)
680 if (parse_merge_opt(&o, xopts[x]))
bacec478 681 die(_("Unknown option for merge-recursive: -X%s"), xopts[x]);
18668f53
MV
682
683 o.branch1 = head_arg;
ae8e4c9c 684 o.branch2 = merge_remote_util(remoteheads->item)->name;
18668f53
MV
685
686 for (j = common; j; j = j->next)
687 commit_list_insert(j->item, &reversed);
688
b3e83cc7 689 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
894642f6 690 clean = merge_recursive(&o, head,
18668f53 691 remoteheads->item, reversed, &result);
f241ff0d
JS
692 if (clean < 0)
693 exit(128);
61000814
694 if (write_locked_index(&the_index, &lock,
695 COMMIT_LOCK | SKIP_IF_UNCHANGED))
1a07e59c 696 die(_("unable to write %s"), get_index_file());
18668f53
MV
697 return clean ? 0 : 1;
698 } else {
67ac1e1d
JN
699 return try_merge_command(strategy, xopts_nr, xopts,
700 common, head_arg, remoteheads);
18668f53 701 }
1c7b76be
MV
702}
703
704static void count_diff_files(struct diff_queue_struct *q,
705 struct diff_options *opt, void *data)
706{
707 int *count = data;
708
709 (*count) += q->nr;
710}
711
712static int count_unmerged_entries(void)
713{
1c7b76be
MV
714 int i, ret = 0;
715
be6ff819
JH
716 for (i = 0; i < active_nr; i++)
717 if (ce_stage(active_cache[i]))
1c7b76be
MV
718 ret++;
719
720 return ret;
721}
722
1c7b76be
MV
723static void add_strategies(const char *string, unsigned attr)
724{
02a8cfa4
RS
725 int i;
726
727 if (string) {
728 struct string_list list = STRING_LIST_INIT_DUP;
729 struct string_list_item *item;
730 string_list_split(&list, string, ' ', -1);
731 for_each_string_list_item(item, &list)
732 append_strategy(get_strategy(item->string));
733 string_list_clear(&list, 0);
1c7b76be
MV
734 return;
735 }
736 for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
737 if (all_strategy[i].attr & attr)
738 append_strategy(&all_strategy[i]);
739
740}
741
66f4b98a 742static void read_merge_msg(struct strbuf *msg)
65969d43 743{
f932729c 744 const char *filename = git_path_merge_msg();
66f4b98a 745 strbuf_reset(msg);
418c9b17
JN
746 if (strbuf_read_file(msg, filename, 0) < 0)
747 die_errno(_("Could not read from '%s'"), filename);
65969d43
JS
748}
749
4c57bd27
JH
750static void write_merge_state(struct commit_list *);
751static void abort_commit(struct commit_list *remoteheads, const char *err_msg)
65969d43 752{
66f4b98a
JS
753 if (err_msg)
754 error("%s", err_msg);
755 fprintf(stderr,
756 _("Not committing merge; use 'git commit' to complete the merge.\n"));
4c57bd27 757 write_merge_state(remoteheads);
66f4b98a
JS
758 exit(1);
759}
760
f26af3fc
TR
761static const char merge_editor_comment[] =
762N_("Please enter a commit message to explain why this merge is necessary,\n"
763 "especially if it merges an updated upstream into a topic branch.\n"
764 "\n"
eff80a9f 765 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
f26af3fc
TR
766 "the commit.\n");
767
9d89b355 768static void write_merge_heads(struct commit_list *);
4c57bd27 769static void prepare_to_commit(struct commit_list *remoteheads)
66f4b98a
JS
770{
771 struct strbuf msg = STRBUF_INIT;
772 strbuf_addbuf(&msg, &merge_msg);
773 strbuf_addch(&msg, '\n');
62dc42b9
MG
774 if (squash)
775 BUG("the control must not reach here under --squash");
f26af3fc 776 if (0 < option_edit)
eff80a9f 777 strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
14d01b4f
ŁG
778 if (signoff)
779 append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
9d89b355 780 write_merge_heads(remoteheads);
e78d5d49 781 write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
0a3beb0e 782 if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
f932729c 783 git_path_merge_msg(), "merge", NULL))
3e4141d0 784 abort_commit(remoteheads, NULL);
f8246281 785 if (0 < option_edit) {
f932729c 786 if (launch_editor(git_path_merge_msg(), NULL, NULL))
4c57bd27 787 abort_commit(remoteheads, NULL);
66f4b98a 788 }
f8b86359
SB
789
790 if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
791 "commit-msg",
792 git_path_merge_msg(), NULL))
793 abort_commit(remoteheads, NULL);
794
66f4b98a 795 read_merge_msg(&msg);
63af4a84 796 strbuf_stripspace(&msg, 0 < option_edit);
66f4b98a 797 if (!msg.len)
4c57bd27 798 abort_commit(remoteheads, _("Empty commit message."));
66f4b98a
JS
799 strbuf_release(&merge_msg);
800 strbuf_addbuf(&merge_msg, &msg);
801 strbuf_release(&msg);
65969d43
JS
802}
803
4c57bd27 804static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
1c7b76be 805{
52684310 806 struct object_id result_tree, result_commit;
910a09a7 807 struct commit_list *parents, **pptr = &parents;
b2275868 808 struct lock_file lock = LOCK_INIT;
40d71940 809
b3e83cc7 810 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
40d71940 811 refresh_cache(REFRESH_QUIET);
61000814
812 if (write_locked_index(&the_index, &lock,
813 COMMIT_LOCK | SKIP_IF_UNCHANGED))
40d71940 814 return error(_("Unable to write index."));
1c7b76be 815
52684310 816 write_tree_trivial(&result_tree);
157efde1 817 printf(_("Wonderful.\n"));
910a09a7
RS
818 pptr = commit_list_append(head, pptr);
819 pptr = commit_list_append(remoteheads->item, pptr);
4c57bd27 820 prepare_to_commit(remoteheads);
5078f344
PO
821 if (commit_tree(merge_msg.buf, merge_msg.len, &result_tree, parents,
822 &result_commit, NULL, sign_commit))
6b3c4c05 823 die(_("failed to write commit object"));
52684310 824 finish(head, remoteheads, &result_commit, "In-index merge");
1c7b76be
MV
825 drop_save();
826 return 0;
827}
828
894642f6 829static int finish_automerge(struct commit *head,
e78cbf8c 830 int head_subsumed,
894642f6 831 struct commit_list *common,
4c57bd27 832 struct commit_list *remoteheads,
52684310 833 struct object_id *result_tree,
1c7b76be
MV
834 const char *wt_strategy)
835{
e78cbf8c 836 struct commit_list *parents = NULL;
1c7b76be 837 struct strbuf buf = STRBUF_INIT;
52684310 838 struct object_id result_commit;
1c7b76be
MV
839
840 free_commit_list(common);
e78cbf8c 841 parents = remoteheads;
a54841e9 842 if (!head_subsumed || fast_forward == FF_NO)
894642f6 843 commit_list_insert(head, &parents);
1c7b76be 844 strbuf_addch(&merge_msg, '\n');
4c57bd27 845 prepare_to_commit(remoteheads);
5078f344
PO
846 if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents,
847 &result_commit, NULL, sign_commit))
6b3c4c05 848 die(_("failed to write commit object"));
f23101bf 849 strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
52684310 850 finish(head, remoteheads, &result_commit, buf.buf);
1c7b76be
MV
851 strbuf_release(&buf);
852 drop_save();
853 return 0;
854}
855
08e3ce5a 856static int suggest_conflicts(void)
1c7b76be 857{
418c9b17 858 const char *filename;
1c7b76be 859 FILE *fp;
75c961b7 860 struct strbuf msgbuf = STRBUF_INIT;
1c7b76be 861
f932729c 862 filename = git_path_merge_msg();
23a9e071 863 fp = xfopen(filename, "a");
75c961b7
JH
864
865 append_conflicts_hint(&msgbuf);
866 fputs(msgbuf.buf, fp);
8d025b7c 867 strbuf_release(&msgbuf);
1c7b76be 868 fclose(fp);
cb6020bb 869 rerere(allow_rerere_auto);
bacec478
ÆAB
870 printf(_("Automatic merge failed; "
871 "fix conflicts and then commit the result.\n"));
1c7b76be
MV
872 return 1;
873}
874
1c7b76be
MV
875static int evaluate_result(void)
876{
877 int cnt = 0;
878 struct rev_info rev;
879
1c7b76be
MV
880 /* Check how many files differ. */
881 init_revisions(&rev, "");
882 setup_revisions(0, NULL, &rev, NULL);
883 rev.diffopt.output_format |=
884 DIFF_FORMAT_CALLBACK;
885 rev.diffopt.format_callback = count_diff_files;
886 rev.diffopt.format_callback_data = &cnt;
887 run_diff_files(&rev, 0);
888
889 /*
890 * Check how many unmerged entries are
891 * there.
892 */
893 cnt += count_unmerged_entries();
894
895 return cnt;
896}
897
93e535a5 898/*
d6ac1d21 899 * Pretend as if the user told us to merge with the remote-tracking
93e535a5
JH
900 * branch we have for the upstream of the current branch
901 */
902static int setup_with_upstream(const char ***argv)
903{
904 struct branch *branch = branch_get(NULL);
905 int i;
906 const char **args;
907
908 if (!branch)
c7f426d4 909 die(_("No current branch."));
9e3751d4 910 if (!branch->remote_name)
c7f426d4 911 die(_("No remote for the current branch."));
93e535a5 912 if (!branch->merge_nr)
c7f426d4 913 die(_("No default upstream defined for the current branch."));
93e535a5 914
50a6c8ef 915 args = xcalloc(st_add(branch->merge_nr, 1), sizeof(char *));
93e535a5
JH
916 for (i = 0; i < branch->merge_nr; i++) {
917 if (!branch->merge[i]->dst)
d6ac1d21 918 die(_("No remote-tracking branch for %s from %s"),
93e535a5
JH
919 branch->merge[i]->src, branch->remote_name);
920 args[i] = branch->merge[i]->dst;
921 }
922 args[i] = NULL;
923 *argv = args;
924 return i;
925}
926
8e6a6bb3 927static void write_merge_heads(struct commit_list *remoteheads)
66f4b98a 928{
66f4b98a
JS
929 struct commit_list *j;
930 struct strbuf buf = STRBUF_INIT;
931
274a5c06 932 for (j = remoteheads; j; j = j->next) {
f2fd0760 933 struct object_id *oid;
274a5c06 934 struct commit *c = j->item;
e2e5ac23
NTND
935 struct merge_remote_desc *desc;
936
937 desc = merge_remote_util(c);
938 if (desc && desc->obj) {
939 oid = &desc->obj->oid;
274a5c06 940 } else {
f2fd0760 941 oid = &c->object.oid;
274a5c06 942 }
f2fd0760 943 strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
274a5c06 944 }
e78d5d49 945 write_file_buf(git_path_merge_head(), buf.buf, buf.len);
418c9b17 946
66f4b98a 947 strbuf_reset(&buf);
a54841e9 948 if (fast_forward == FF_NO)
a22ae753 949 strbuf_addstr(&buf, "no-ff");
e78d5d49 950 write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
814c4b37 951 strbuf_release(&buf);
66f4b98a
JS
952}
953
8e6a6bb3
MG
954static void write_merge_state(struct commit_list *remoteheads)
955{
956 write_merge_heads(remoteheads);
957 strbuf_addch(&merge_msg, '\n');
958 write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len);
959}
960
f8246281
JH
961static int default_edit_option(void)
962{
963 static const char name[] = "GIT_MERGE_AUTOEDIT";
964 const char *e = getenv(name);
965 struct stat st_stdin, st_stdout;
966
967 if (have_message)
968 /* an explicit -m msg without --[no-]edit */
969 return 0;
970
971 if (e) {
89576613 972 int v = git_parse_maybe_bool(e);
f8246281 973 if (v < 0)
bef4830e 974 die(_("Bad value '%s' in environment '%s'"), e, name);
f8246281
JH
975 return v;
976 }
977
978 /* Use editor if stdin and stdout are the same and is a tty */
979 return (!fstat(0, &st_stdin) &&
980 !fstat(1, &st_stdout) &&
d46f476c 981 isatty(0) && isatty(1) &&
f8246281
JH
982 st_stdin.st_dev == st_stdout.st_dev &&
983 st_stdin.st_ino == st_stdout.st_ino &&
984 st_stdin.st_mode == st_stdout.st_mode);
985}
986
34349dbf
JH
987static struct commit_list *reduce_parents(struct commit *head_commit,
988 int *head_subsumed,
989 struct commit_list *remoteheads)
b5d887f9 990{
e510ab89 991 struct commit_list *parents, **remotes;
b5d887f9 992
0b10b8a3
JH
993 /*
994 * Is the current HEAD reachable from another commit being
995 * merged? If so we do not want to record it as a parent of
996 * the resulting merge, unless --no-ff is given. We will flip
997 * this variable to 0 when we find HEAD among the independent
998 * tips being merged.
999 */
1000 *head_subsumed = 1;
e78cbf8c 1001
0b10b8a3 1002 /* Find what parents to record by checking independent ones. */
e78cbf8c 1003 parents = reduce_heads(remoteheads);
4da72644 1004 free_commit_list(remoteheads);
e78cbf8c 1005
e510ab89
RS
1006 remoteheads = NULL;
1007 remotes = &remoteheads;
1008 while (parents) {
1009 struct commit *commit = pop_commit(&parents);
e78cbf8c
JH
1010 if (commit == head_commit)
1011 *head_subsumed = 0;
1012 else
1013 remotes = &commit_list_insert(commit, remotes)->next;
1014 }
b5d887f9
JH
1015 return remoteheads;
1016}
f8246281 1017
52fecab2
JH
1018static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *merge_msg)
1019{
1020 struct fmt_merge_msg_opts opts;
1021
1022 memset(&opts, 0, sizeof(opts));
1023 opts.add_title = !have_message;
1024 opts.shortlog_len = shortlog_len;
1025 opts.credit_people = (0 < option_edit);
1026
1027 fmt_merge_msg(merge_names, merge_msg, &opts);
1028 if (merge_msg->len)
1029 strbuf_setlen(merge_msg, merge_msg->len - 1);
1030}
1031
74e8bc59
JH
1032static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge_names)
1033{
1034 const char *filename;
1035 int fd, pos, npos;
1036 struct strbuf fetch_head_file = STRBUF_INIT;
1037
1038 if (!merge_names)
1039 merge_names = &fetch_head_file;
1040
f932729c 1041 filename = git_path_fetch_head();
74e8bc59
JH
1042 fd = open(filename, O_RDONLY);
1043 if (fd < 0)
1044 die_errno(_("could not open '%s' for reading"), filename);
1045
1046 if (strbuf_read(merge_names, fd, 0) < 0)
1047 die_errno(_("could not read '%s'"), filename);
1048 if (close(fd) < 0)
1049 die_errno(_("could not close '%s'"), filename);
1050
1051 for (pos = 0; pos < merge_names->len; pos = npos) {
52684310 1052 struct object_id oid;
74e8bc59
JH
1053 char *ptr;
1054 struct commit *commit;
1055
1056 ptr = strchr(merge_names->buf + pos, '\n');
1057 if (ptr)
1058 npos = ptr - merge_names->buf + 1;
1059 else
1060 npos = merge_names->len;
1061
52684310 1062 if (npos - pos < GIT_SHA1_HEXSZ + 2 ||
1063 get_oid_hex(merge_names->buf + pos, &oid))
74e8bc59 1064 commit = NULL; /* bad */
52684310 1065 else if (memcmp(merge_names->buf + pos + GIT_SHA1_HEXSZ, "\t\t", 2))
74e8bc59
JH
1066 continue; /* not-for-merge */
1067 else {
52684310 1068 char saved = merge_names->buf[pos + GIT_SHA1_HEXSZ];
1069 merge_names->buf[pos + GIT_SHA1_HEXSZ] = '\0';
74e8bc59 1070 commit = get_merge_parent(merge_names->buf + pos);
52684310 1071 merge_names->buf[pos + GIT_SHA1_HEXSZ] = saved;
74e8bc59
JH
1072 }
1073 if (!commit) {
1074 if (ptr)
1075 *ptr = '\0';
bef4830e 1076 die(_("not something we can merge in %s: %s"),
74e8bc59
JH
1077 filename, merge_names->buf + pos);
1078 }
1079 remotes = &commit_list_insert(commit, remotes)->next;
1080 }
1081
1082 if (merge_names == &fetch_head_file)
1083 strbuf_release(&fetch_head_file);
1084}
1085
34349dbf
JH
1086static struct commit_list *collect_parents(struct commit *head_commit,
1087 int *head_subsumed,
1cf32f4d
JH
1088 int argc, const char **argv,
1089 struct strbuf *merge_msg)
34349dbf
JH
1090{
1091 int i;
1092 struct commit_list *remoteheads = NULL;
1093 struct commit_list **remotes = &remoteheads;
77038015
JH
1094 struct strbuf merge_names = STRBUF_INIT, *autogen = NULL;
1095
1096 if (merge_msg && (!have_message || shortlog_len))
1097 autogen = &merge_names;
34349dbf
JH
1098
1099 if (head_commit)
1100 remotes = &commit_list_insert(head_commit, remotes)->next;
34349dbf 1101
74e8bc59
JH
1102 if (argc == 1 && !strcmp(argv[0], "FETCH_HEAD")) {
1103 handle_fetch_head(remotes, autogen);
1104 remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
1105 } else {
1106 for (i = 0; i < argc; i++) {
1107 struct commit *commit = get_merge_parent(argv[i]);
1108 if (!commit)
1109 help_unknown_ref(argv[i], "merge",
bef4830e 1110 _("not something we can merge"));
74e8bc59
JH
1111 remotes = &commit_list_insert(commit, remotes)->next;
1112 }
1113 remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
1114 if (autogen) {
1115 struct commit_list *p;
1116 for (p = remoteheads; p; p = p->next)
1117 merge_name(merge_remote_util(p->item)->name, autogen);
1118 }
1119 }
1cf32f4d 1120
77038015 1121 if (autogen) {
77038015
JH
1122 prepare_merge_message(autogen, merge_msg);
1123 strbuf_release(autogen);
1cf32f4d
JH
1124 }
1125
1126 return remoteheads;
34349dbf
JH
1127}
1128
adcc94a0
JH
1129static int merging_a_throwaway_tag(struct commit *commit)
1130{
1131 char *tag_ref;
1132 struct object_id oid;
1133 int is_throwaway_tag = 0;
1134
1135 /* Are we merging a tag? */
1136 if (!merge_remote_util(commit) ||
1137 !merge_remote_util(commit)->obj ||
1138 merge_remote_util(commit)->obj->type != OBJ_TAG)
1139 return is_throwaway_tag;
1140
1141 /*
1142 * Now we know we are merging a tag object. Are we downstream
1143 * and following the tags from upstream? If so, we must have
1144 * the tag object pointed at by "refs/tags/$T" where $T is the
1145 * tagname recorded in the tag object. We want to allow such
1146 * a "just to catch up" merge to fast-forward.
1147 *
1148 * Otherwise, we are playing an integrator's role, making a
1149 * merge with a throw-away tag from a contributor with
1150 * something like "git pull $contributor $signed_tag".
1151 * We want to forbid such a merge from fast-forwarding
1152 * by default; otherwise we would not keep the signature
1153 * anywhere.
1154 */
1155 tag_ref = xstrfmt("refs/tags/%s",
1156 ((struct tag *)merge_remote_util(commit)->obj)->tag);
1157 if (!read_ref(tag_ref, &oid) &&
1158 !oidcmp(&oid, &merge_remote_util(commit)->obj->oid))
1159 is_throwaway_tag = 0;
1160 else
1161 is_throwaway_tag = 1;
1162 free(tag_ref);
1163 return is_throwaway_tag;
1164}
1165
1c7b76be
MV
1166int cmd_merge(int argc, const char **argv, const char *prefix)
1167{
52684310 1168 struct object_id result_tree, stash, head_oid;
894642f6 1169 struct commit *head_commit;
f285a2d7 1170 struct strbuf buf = STRBUF_INIT;
17377b62 1171 int i, ret = 0, head_subsumed;
1c7b76be
MV
1172 int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
1173 struct commit_list *common = NULL;
1174 const char *best_strategy = NULL, *wt_strategy = NULL;
b5d887f9 1175 struct commit_list *remoteheads, *p;
96ec7b1e 1176 void *branch_to_free;
367ff694 1177 int orig_argc = argc;
1c7b76be 1178
da53eec6
NTND
1179 if (argc == 2 && !strcmp(argv[1], "-h"))
1180 usage_with_options(builtin_merge_usage, builtin_merge_options);
1c7b76be
MV
1181
1182 /*
1183 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1184 * current branch.
1185 */
0f2dc722 1186 branch = branch_to_free = resolve_refdup("HEAD", 0, &head_oid, NULL);
de3ce210
RS
1187 if (branch)
1188 skip_prefix(branch, "refs/heads/", &branch);
7adf5266
DS
1189
1190 init_diff_ui_defaults();
1191 git_config(git_merge_config, NULL);
1192
52684310 1193 if (!branch || is_null_oid(&head_oid))
894642f6 1194 head_commit = NULL;
baf18fc2 1195 else
bc83266a 1196 head_commit = lookup_commit_or_die(&head_oid, "HEAD");
1c7b76be 1197
0d8fc3ef
JH
1198 if (branch_mergeoptions)
1199 parse_branch_merge_options(branch_mergeoptions);
37782920 1200 argc = parse_options(argc, argv, prefix, builtin_merge_options,
1c7b76be 1201 builtin_merge_usage, 0);
898eacd8
JH
1202 if (shortlog_len < 0)
1203 shortlog_len = (merge_log_config > 0) ? merge_log_config : 0;
2a22c1b3 1204
99bfc669
JK
1205 if (verbosity < 0 && show_progress == -1)
1206 show_progress = 0;
1207
35d2fffd
JH
1208 if (abort_current_merge) {
1209 int nargc = 2;
1210 const char *nargv[] = {"reset", "--merge", NULL};
1211
042e290d 1212 if (orig_argc != 2)
c7d227df 1213 usage_msg_opt(_("--abort expects no arguments"),
042e290d
CP
1214 builtin_merge_usage, builtin_merge_options);
1215
f932729c 1216 if (!file_exists(git_path_merge_head()))
bacec478 1217 die(_("There is no merge to abort (MERGE_HEAD missing)."));
35d2fffd
JH
1218
1219 /* Invoke 'git reset --merge' */
d5a35c11
NTND
1220 ret = cmd_reset(nargc, nargv, prefix);
1221 goto done;
35d2fffd
JH
1222 }
1223
367ff694
CP
1224 if (continue_current_merge) {
1225 int nargc = 1;
1226 const char *nargv[] = {"commit", NULL};
1227
1228 if (orig_argc != 2)
c7d227df 1229 usage_msg_opt(_("--continue expects no arguments"),
367ff694
CP
1230 builtin_merge_usage, builtin_merge_options);
1231
1232 if (!file_exists(git_path_merge_head()))
1233 die(_("There is no merge in progress (MERGE_HEAD missing)."));
1234
1235 /* Invoke 'git commit' */
1236 ret = cmd_commit(nargc, nargv, prefix);
1237 goto done;
1238 }
1239
2a22c1b3
JH
1240 if (read_cache_unmerged())
1241 die_resolve_conflict("merge");
1242
f932729c 1243 if (file_exists(git_path_merge_head())) {
2a22c1b3
JH
1244 /*
1245 * There is no unmerged entry, don't advise 'git
1246 * add/rm <file>', just 'git commit'.
1247 */
1248 if (advice_resolve_conflict)
bacec478 1249 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
ad5fe377 1250 "Please, commit your changes before you merge."));
2a22c1b3 1251 else
bacec478 1252 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
2a22c1b3 1253 }
f932729c 1254 if (file_exists(git_path_cherry_pick_head())) {
d7e5c0cb 1255 if (advice_resolve_conflict)
f68f1801 1256 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
ad5fe377 1257 "Please, commit your changes before you merge."));
d7e5c0cb 1258 else
f68f1801 1259 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
2a22c1b3
JH
1260 }
1261 resolve_undo_clear();
1262
7f87aff2
TA
1263 if (verbosity < 0)
1264 show_diffstat = 0;
1c7b76be
MV
1265
1266 if (squash) {
a54841e9 1267 if (fast_forward == FF_NO)
bacec478 1268 die(_("You cannot combine --squash with --no-ff."));
1c7b76be
MV
1269 option_commit = 0;
1270 }
1271
00c7e7e7
JH
1272 if (!argc) {
1273 if (default_to_upstream)
1274 argc = setup_with_upstream(&argv);
1275 else
1276 die(_("No commit specified and merge.defaultToUpstream not set."));
1277 } else if (argc == 1 && !strcmp(argv[0], "-")) {
1278 argv[0] = "@{-1}";
4e8115ff 1279 }
00c7e7e7 1280
1c7b76be
MV
1281 if (!argc)
1282 usage_with_options(builtin_merge_usage,
1283 builtin_merge_options);
1284
1faac1ce 1285 if (!head_commit) {
1c7b76be
MV
1286 /*
1287 * If the merged head is a valid one there is no reason
1288 * to forbid "git merge" into a branch yet to be born.
1289 * We do the same for "git pull".
1290 */
52684310 1291 struct object_id *remote_head_oid;
4be636f4 1292 if (squash)
bacec478 1293 die(_("Squash commit into empty head not supported yet"));
a54841e9 1294 if (fast_forward == FF_NO)
bacec478
ÆAB
1295 die(_("Non-fast-forward commit does not make sense into "
1296 "an empty head"));
1cf32f4d
JH
1297 remoteheads = collect_parents(head_commit, &head_subsumed,
1298 argc, argv, NULL);
b84e65d4 1299 if (!remoteheads)
bacec478 1300 die(_("%s - not something we can merge"), argv[0]);
eaa4e59c
JH
1301 if (remoteheads->next)
1302 die(_("Can merge only exactly one commit into empty head"));
52684310 1303 remote_head_oid = &remoteheads->item->object.oid;
cb91022c 1304 read_empty(remote_head_oid, 0);
ae077771 1305 update_ref("initial pull", "HEAD", remote_head_oid, NULL, 0,
1306 UPDATE_REFS_DIE_ON_ERR);
d5a35c11 1307 goto done;
1faac1ce 1308 }
1c7b76be 1309
1faac1ce 1310 /*
b4391657
JH
1311 * All the rest are the commits being merged; prepare
1312 * the standard merge summary message to be appended
1313 * to the given message.
1faac1ce 1314 */
b4391657
JH
1315 remoteheads = collect_parents(head_commit, &head_subsumed,
1316 argc, argv, &merge_msg);
1c7b76be 1317
894642f6 1318 if (!head_commit || !argc)
1c7b76be
MV
1319 usage_with_options(builtin_merge_usage,
1320 builtin_merge_options);
1321
efed0022
SG
1322 if (verify_signatures) {
1323 for (p = remoteheads; p; p = p->next) {
1324 struct commit *commit = p->item;
dc01505f 1325 char hex[GIT_MAX_HEXSZ + 1];
efed0022
SG
1326 struct signature_check signature_check;
1327 memset(&signature_check, 0, sizeof(signature_check));
1328
1329 check_commit_signature(commit, &signature_check);
1330
aab9583f 1331 find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
efed0022
SG
1332 switch (signature_check.result) {
1333 case 'G':
1334 break;
eb307ae7
SG
1335 case 'U':
1336 die(_("Commit %s has an untrusted GPG signature, "
1337 "allegedly by %s."), hex, signature_check.signer);
efed0022
SG
1338 case 'B':
1339 die(_("Commit %s has a bad GPG signature "
1340 "allegedly by %s."), hex, signature_check.signer);
1341 default: /* 'N' */
1342 die(_("Commit %s does not have a GPG signature."), hex);
1343 }
1344 if (verbosity >= 0 && signature_check.result == 'G')
1345 printf(_("Commit %s has a good GPG signature by %s\n"),
1346 hex, signature_check.signer);
1347
01e57b5d 1348 signature_check_clear(&signature_check);
efed0022
SG
1349 }
1350 }
1351
1c7b76be 1352 strbuf_addstr(&buf, "merge");
b5d887f9
JH
1353 for (p = remoteheads; p; p = p->next)
1354 strbuf_addf(&buf, " %s", merge_remote_util(p->item)->name);
1c7b76be
MV
1355 setenv("GIT_REFLOG_ACTION", buf.buf, 0);
1356 strbuf_reset(&buf);
1357
b5d887f9
JH
1358 for (p = remoteheads; p; p = p->next) {
1359 struct commit *commit = p->item;
ae8e4c9c 1360 strbuf_addf(&buf, "GITHEAD_%s",
c368dde9 1361 oid_to_hex(&commit->object.oid));
b5d887f9 1362 setenv(buf.buf, merge_remote_util(commit)->name, 1);
1c7b76be 1363 strbuf_reset(&buf);
adcc94a0 1364 if (fast_forward != FF_ONLY && merging_a_throwaway_tag(commit))
a54841e9 1365 fast_forward = FF_NO;
1c7b76be
MV
1366 }
1367
f8246281
JH
1368 if (option_edit < 0)
1369 option_edit = default_edit_option();
1370
1c7b76be 1371 if (!use_strategies) {
e78cbf8c
JH
1372 if (!remoteheads)
1373 ; /* already up-to-date */
1374 else if (!remoteheads->next)
1c7b76be
MV
1375 add_strategies(pull_twohead, DEFAULT_TWOHEAD);
1376 else
1377 add_strategies(pull_octopus, DEFAULT_OCTOPUS);
1378 }
1379
1380 for (i = 0; i < use_strategies_nr; i++) {
1381 if (use_strategies[i]->attr & NO_FAST_FORWARD)
a54841e9 1382 fast_forward = FF_NO;
1c7b76be
MV
1383 if (use_strategies[i]->attr & NO_TRIVIAL)
1384 allow_trivial = 0;
1385 }
1386
e78cbf8c
JH
1387 if (!remoteheads)
1388 ; /* already up-to-date */
1389 else if (!remoteheads->next)
2ce406cc 1390 common = get_merge_bases(head_commit, remoteheads->item);
1c7b76be
MV
1391 else {
1392 struct commit_list *list = remoteheads;
894642f6 1393 commit_list_insert(head_commit, &list);
1c7b76be
MV
1394 common = get_octopus_merge_bases(list);
1395 free(list);
1396 }
1397
ae077771 1398 update_ref("updating ORIG_HEAD", "ORIG_HEAD",
1399 &head_commit->object.oid, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
1c7b76be 1400
e379fdf3
JH
1401 if (remoteheads && !common) {
1402 /* No common ancestors found. */
1403 if (!allow_unrelated_histories)
1404 die(_("refusing to merge unrelated histories"));
1405 /* otherwise, we need a real merge. */
1406 } else if (!remoteheads ||
e78cbf8c
JH
1407 (!remoteheads->next && !common->next &&
1408 common->item == remoteheads->item)) {
1c7b76be
MV
1409 /*
1410 * If head can reach all the merge then we are up to date.
1411 * but first the most common case of merging one remote.
1412 */
7560f547 1413 finish_up_to_date(_("Already up to date."));
d5a35c11 1414 goto done;
a54841e9 1415 } else if (fast_forward != FF_NO && !remoteheads->next &&
1c7b76be 1416 !common->next &&
c368dde9 1417 !oidcmp(&common->item->object.oid, &head_commit->object.oid)) {
1c7b76be 1418 /* Again the most common case of merging one remote. */
f285a2d7 1419 struct strbuf msg = STRBUF_INIT;
ae8e4c9c 1420 struct commit *commit;
1c7b76be 1421
d59f765a 1422 if (verbosity >= 0) {
ef2ed501 1423 printf(_("Updating %s..%s\n"),
aab9583f 1424 find_unique_abbrev(&head_commit->object.oid,
ef2ed501 1425 DEFAULT_ABBREV),
aab9583f 1426 find_unique_abbrev(&remoteheads->item->object.oid,
ef2ed501 1427 DEFAULT_ABBREV));
d59f765a 1428 }
a75d7b54 1429 strbuf_addstr(&msg, "Fast-forward");
1c7b76be
MV
1430 if (have_message)
1431 strbuf_addstr(&msg,
1432 " (no commit created; -m option ignored)");
ae8e4c9c 1433 commit = remoteheads->item;
b7f7c079 1434 if (!commit) {
d5a35c11
NTND
1435 ret = 1;
1436 goto done;
1437 }
1c7b76be 1438
f06e90da 1439 if (checkout_fast_forward(&head_commit->object.oid,
1440 &commit->object.oid,
db699a8a 1441 overwrite_ignore)) {
d5a35c11
NTND
1442 ret = 1;
1443 goto done;
1444 }
1c7b76be 1445
52684310 1446 finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
1c7b76be 1447 drop_save();
d5a35c11 1448 goto done;
1c7b76be
MV
1449 } else if (!remoteheads->next && common->next)
1450 ;
1451 /*
a75d7b54 1452 * We are not doing octopus and not fast-forward. Need
1c7b76be
MV
1453 * a real merge.
1454 */
1455 else if (!remoteheads->next && !common->next && option_commit) {
1456 /*
a75d7b54 1457 * We are not doing octopus, not fast-forward, and have
1c7b76be
MV
1458 * only one common.
1459 */
1460 refresh_cache(REFRESH_QUIET);
a54841e9 1461 if (allow_trivial && fast_forward != FF_ONLY) {
1c7b76be 1462 /* See if it is really trivial. */
f9bc573f 1463 git_committer_info(IDENT_STRICT);
bacec478 1464 printf(_("Trying really trivial in-index merge...\n"));
52684310 1465 if (!read_tree_trivial(&common->item->object.oid,
1466 &head_commit->object.oid,
1467 &remoteheads->item->object.oid)) {
4c57bd27 1468 ret = merge_trivial(head_commit, remoteheads);
d5a35c11
NTND
1469 goto done;
1470 }
bacec478 1471 printf(_("Nope.\n"));
1c7b76be
MV
1472 }
1473 } else {
1474 /*
1475 * An octopus. If we can reach all the remote we are up
1476 * to date.
1477 */
1478 int up_to_date = 1;
1479 struct commit_list *j;
1480
1481 for (j = remoteheads; j; j = j->next) {
1482 struct commit_list *common_one;
1483
1484 /*
1485 * Here we *have* to calculate the individual
1486 * merge_bases again, otherwise "git merge HEAD^
1487 * HEAD^^" would be missed.
1488 */
2ce406cc 1489 common_one = get_merge_bases(head_commit, j->item);
c368dde9 1490 if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) {
1c7b76be
MV
1491 up_to_date = 0;
1492 break;
1493 }
1494 }
1495 if (up_to_date) {
7560f547 1496 finish_up_to_date(_("Already up to date. Yeeah!"));
d5a35c11 1497 goto done;
1c7b76be
MV
1498 }
1499 }
1500
a54841e9 1501 if (fast_forward == FF_ONLY)
bacec478 1502 die(_("Not possible to fast-forward, aborting."));
13474835 1503
1c7b76be 1504 /* We are going to make a new commit. */
f9bc573f 1505 git_committer_info(IDENT_STRICT);
1c7b76be
MV
1506
1507 /*
1508 * At this point, we need a real merge. No matter what strategy
1509 * we use, it would operate on the index, possibly affecting the
1510 * working tree, and when resolved cleanly, have the desired
1511 * tree in the index -- this means that the index must be in
1512 * sync with the head commit. The strategies are responsible
1513 * to ensure this.
1514 */
b4fd9406
NTND
1515 if (use_strategies_nr == 1 ||
1516 /*
1517 * Stash away the local changes so that we can try more than one.
1518 */
52684310 1519 save_state(&stash))
1520 oidclr(&stash);
1c7b76be
MV
1521
1522 for (i = 0; i < use_strategies_nr; i++) {
1523 int ret;
1524 if (i) {
bacec478 1525 printf(_("Rewinding the tree to pristine...\n"));
52684310 1526 restore_state(&head_commit->object.oid, &stash);
1c7b76be
MV
1527 }
1528 if (use_strategies_nr != 1)
bacec478 1529 printf(_("Trying merge strategy %s...\n"),
1c7b76be
MV
1530 use_strategies[i]->name);
1531 /*
1532 * Remember which strategy left the state in the working
1533 * tree.
1534 */
1535 wt_strategy = use_strategies[i]->name;
1536
1537 ret = try_merge_strategy(use_strategies[i]->name,
4c57bd27 1538 common, remoteheads,
b4391657 1539 head_commit);
1c7b76be
MV
1540 if (!option_commit && !ret) {
1541 merge_was_ok = 1;
1542 /*
1543 * This is necessary here just to avoid writing
1544 * the tree, but later we will *not* exit with
1545 * status code 1 because merge_was_ok is set.
1546 */
1547 ret = 1;
1548 }
1549
1550 if (ret) {
1551 /*
1552 * The backend exits with 1 when conflicts are
1553 * left to be resolved, with 2 when it does not
1554 * handle the given merge at all.
1555 */
1556 if (ret == 1) {
1557 int cnt = evaluate_result();
1558
1559 if (best_cnt <= 0 || cnt <= best_cnt) {
1560 best_strategy = use_strategies[i]->name;
1561 best_cnt = cnt;
1562 }
1563 }
1564 if (merge_was_ok)
1565 break;
1566 else
1567 continue;
1568 }
1569
1570 /* Automerge succeeded. */
52684310 1571 write_tree_trivial(&result_tree);
1c7b76be
MV
1572 automerge_was_ok = 1;
1573 break;
1574 }
1575
1576 /*
1577 * If we have a resulting tree, that means the strategy module
1578 * auto resolved the merge cleanly.
1579 */
d5a35c11 1580 if (automerge_was_ok) {
e78cbf8c
JH
1581 ret = finish_automerge(head_commit, head_subsumed,
1582 common, remoteheads,
52684310 1583 &result_tree, wt_strategy);
d5a35c11
NTND
1584 goto done;
1585 }
1c7b76be
MV
1586
1587 /*
1588 * Pick the result from the best strategy and have the user fix
1589 * it up.
1590 */
1591 if (!best_strategy) {
52684310 1592 restore_state(&head_commit->object.oid, &stash);
1c7b76be
MV
1593 if (use_strategies_nr > 1)
1594 fprintf(stderr,
bacec478 1595 _("No merge strategy handled the merge.\n"));
1c7b76be 1596 else
bacec478 1597 fprintf(stderr, _("Merge with strategy %s failed.\n"),
1c7b76be 1598 use_strategies[0]->name);
d5a35c11
NTND
1599 ret = 2;
1600 goto done;
1c7b76be
MV
1601 } else if (best_strategy == wt_strategy)
1602 ; /* We already have its result in the working tree. */
1603 else {
bacec478 1604 printf(_("Rewinding the tree to pristine...\n"));
52684310 1605 restore_state(&head_commit->object.oid, &stash);
bacec478 1606 printf(_("Using the %s to prepare resolving by hand.\n"),
1c7b76be 1607 best_strategy);
4c57bd27 1608 try_merge_strategy(best_strategy, common, remoteheads,
b4391657 1609 head_commit);
1c7b76be
MV
1610 }
1611
1612 if (squash)
4c57bd27 1613 finish(head_commit, remoteheads, NULL, NULL);
66f4b98a 1614 else
4c57bd27 1615 write_merge_state(remoteheads);
1c7b76be 1616
d5a35c11 1617 if (merge_was_ok)
bacec478
ÆAB
1618 fprintf(stderr, _("Automatic merge went well; "
1619 "stopped before committing as requested\n"));
d5a35c11 1620 else
08e3ce5a 1621 ret = suggest_conflicts();
d5a35c11
NTND
1622
1623done:
96ec7b1e 1624 free(branch_to_free);
d5a35c11 1625 return ret;
1c7b76be 1626}