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