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