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