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