]>
Commit | Line | Data |
---|---|---|
1c7b76be MV |
1 | /* |
2 | * Builtin "git merge" | |
3 | * | |
4 | * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org> | |
5 | * | |
6 | * Based on git-merge.sh by Junio C Hamano. | |
7 | */ | |
8 | ||
9 | #include "cache.h" | |
10 | #include "parse-options.h" | |
11 | #include "builtin.h" | |
12 | #include "run-command.h" | |
13 | #include "diff.h" | |
14 | #include "refs.h" | |
15 | #include "commit.h" | |
16 | #include "diffcore.h" | |
17 | #include "revision.h" | |
18 | #include "unpack-trees.h" | |
19 | #include "cache-tree.h" | |
20 | #include "dir.h" | |
21 | #include "utf8.h" | |
22 | #include "log-tree.h" | |
23 | #include "color.h" | |
fcab40a3 | 24 | #include "rerere.h" |
87091b49 | 25 | #include "help.h" |
18668f53 | 26 | #include "merge-recursive.h" |
cfc5789a | 27 | #include "resolve-undo.h" |
1c7b76be MV |
28 | |
29 | #define DEFAULT_TWOHEAD (1<<0) | |
30 | #define DEFAULT_OCTOPUS (1<<1) | |
31 | #define NO_FAST_FORWARD (1<<2) | |
32 | #define NO_TRIVIAL (1<<3) | |
33 | ||
34 | struct strategy { | |
35 | const char *name; | |
36 | unsigned attr; | |
37 | }; | |
38 | ||
39 | static const char * const builtin_merge_usage[] = { | |
34263de0 AP |
40 | "git merge [options] <remote>...", |
41 | "git merge [options] <msg> HEAD <remote>", | |
1c7b76be MV |
42 | NULL |
43 | }; | |
44 | ||
45 | static int show_diffstat = 1, option_log, squash; | |
46 | static int option_commit = 1, allow_fast_forward = 1; | |
13474835 | 47 | static int fast_forward_only; |
1c7b76be MV |
48 | static int allow_trivial = 1, have_message; |
49 | static struct strbuf merge_msg; | |
50 | static struct commit_list *remoteheads; | |
51 | static unsigned char head[20], stash[20]; | |
52 | static struct strategy **use_strategies; | |
53 | static size_t use_strategies_nr, use_strategies_alloc; | |
8cc5b290 AP |
54 | static const char **xopts; |
55 | static size_t xopts_nr, xopts_alloc; | |
1c7b76be | 56 | static const char *branch; |
7610fa57 | 57 | static int option_renormalize; |
7f87aff2 | 58 | static int verbosity; |
cb6020bb | 59 | static int allow_rerere_auto; |
1c7b76be MV |
60 | |
61 | static struct strategy all_strategy[] = { | |
1c7b76be MV |
62 | { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, |
63 | { "octopus", DEFAULT_OCTOPUS }, | |
64 | { "resolve", 0 }, | |
1c7b76be MV |
65 | { "ours", NO_FAST_FORWARD | NO_TRIVIAL }, |
66 | { "subtree", NO_FAST_FORWARD | NO_TRIVIAL }, | |
67 | }; | |
68 | ||
69 | static const char *pull_twohead, *pull_octopus; | |
70 | ||
71 | static int option_parse_message(const struct option *opt, | |
72 | const char *arg, int unset) | |
73 | { | |
74 | struct strbuf *buf = opt->value; | |
75 | ||
76 | if (unset) | |
77 | strbuf_setlen(buf, 0); | |
74f5b7fb | 78 | else if (arg) { |
ce9d823b | 79 | strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg); |
1c7b76be | 80 | have_message = 1; |
74f5b7fb MB |
81 | } else |
82 | return error("switch `m' requires a value"); | |
1c7b76be MV |
83 | return 0; |
84 | } | |
85 | ||
86 | static struct strategy *get_strategy(const char *name) | |
87 | { | |
88 | int i; | |
87091b49 MV |
89 | struct strategy *ret; |
90 | static struct cmdnames main_cmds, other_cmds; | |
e321180e | 91 | static int loaded; |
1c7b76be MV |
92 | |
93 | if (!name) | |
94 | return NULL; | |
95 | ||
96 | for (i = 0; i < ARRAY_SIZE(all_strategy); i++) | |
97 | if (!strcmp(name, all_strategy[i].name)) | |
98 | return &all_strategy[i]; | |
1719b5e4 | 99 | |
e321180e | 100 | if (!loaded) { |
87091b49 | 101 | struct cmdnames not_strategies; |
e321180e | 102 | loaded = 1; |
87091b49 | 103 | |
87091b49 | 104 | memset(¬_strategies, 0, sizeof(struct cmdnames)); |
e321180e | 105 | load_command_list("git-merge-", &main_cmds, &other_cmds); |
87091b49 MV |
106 | for (i = 0; i < main_cmds.cnt; i++) { |
107 | int j, found = 0; | |
108 | struct cmdname *ent = main_cmds.names[i]; | |
109 | for (j = 0; j < ARRAY_SIZE(all_strategy); j++) | |
110 | if (!strncmp(ent->name, all_strategy[j].name, ent->len) | |
111 | && !all_strategy[j].name[ent->len]) | |
112 | found = 1; | |
113 | if (!found) | |
114 | add_cmdname(¬_strategies, ent->name, ent->len); | |
87091b49 | 115 | } |
ed874656 | 116 | exclude_cmds(&main_cmds, ¬_strategies); |
87091b49 MV |
117 | } |
118 | if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) { | |
131f9a10 JH |
119 | fprintf(stderr, "Could not find merge strategy '%s'.\n", name); |
120 | fprintf(stderr, "Available strategies are:"); | |
121 | for (i = 0; i < main_cmds.cnt; i++) | |
122 | fprintf(stderr, " %s", main_cmds.names[i]->name); | |
123 | fprintf(stderr, ".\n"); | |
124 | if (other_cmds.cnt) { | |
125 | fprintf(stderr, "Available custom strategies are:"); | |
126 | for (i = 0; i < other_cmds.cnt; i++) | |
127 | fprintf(stderr, " %s", other_cmds.names[i]->name); | |
128 | fprintf(stderr, ".\n"); | |
129 | } | |
87091b49 MV |
130 | exit(1); |
131 | } | |
132 | ||
19d4b416 | 133 | ret = xcalloc(1, sizeof(struct strategy)); |
87091b49 | 134 | ret->name = xstrdup(name); |
52b48ef1 | 135 | ret->attr = NO_TRIVIAL; |
87091b49 | 136 | return ret; |
1c7b76be MV |
137 | } |
138 | ||
139 | static void append_strategy(struct strategy *s) | |
140 | { | |
141 | ALLOC_GROW(use_strategies, use_strategies_nr + 1, use_strategies_alloc); | |
142 | use_strategies[use_strategies_nr++] = s; | |
143 | } | |
144 | ||
145 | static int option_parse_strategy(const struct option *opt, | |
146 | const char *name, int unset) | |
147 | { | |
1c7b76be MV |
148 | if (unset) |
149 | return 0; | |
150 | ||
1719b5e4 | 151 | append_strategy(get_strategy(name)); |
1c7b76be MV |
152 | return 0; |
153 | } | |
154 | ||
8cc5b290 AP |
155 | static int option_parse_x(const struct option *opt, |
156 | const char *arg, int unset) | |
157 | { | |
158 | if (unset) | |
159 | return 0; | |
160 | ||
161 | ALLOC_GROW(xopts, xopts_nr + 1, xopts_alloc); | |
162 | xopts[xopts_nr++] = xstrdup(arg); | |
163 | return 0; | |
164 | } | |
165 | ||
1c7b76be MV |
166 | static int option_parse_n(const struct option *opt, |
167 | const char *arg, int unset) | |
168 | { | |
169 | show_diffstat = unset; | |
170 | return 0; | |
171 | } | |
172 | ||
173 | static struct option builtin_merge_options[] = { | |
174 | { OPTION_CALLBACK, 'n', NULL, NULL, NULL, | |
175 | "do not show a diffstat at the end of the merge", | |
176 | PARSE_OPT_NOARG, option_parse_n }, | |
177 | OPT_BOOLEAN(0, "stat", &show_diffstat, | |
178 | "show a diffstat at the end of the merge"), | |
179 | OPT_BOOLEAN(0, "summary", &show_diffstat, "(synonym to --stat)"), | |
180 | OPT_BOOLEAN(0, "log", &option_log, | |
181 | "add list of one-line log to merge commit message"), | |
182 | OPT_BOOLEAN(0, "squash", &squash, | |
183 | "create a single commit instead of doing a merge"), | |
184 | OPT_BOOLEAN(0, "commit", &option_commit, | |
185 | "perform a commit if the merge succeeds (default)"), | |
186 | OPT_BOOLEAN(0, "ff", &allow_fast_forward, | |
a75d7b54 | 187 | "allow fast-forward (default)"), |
13474835 | 188 | OPT_BOOLEAN(0, "ff-only", &fast_forward_only, |
4d8c3258 | 189 | "abort if fast-forward is not possible"), |
cb6020bb | 190 | OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), |
1c7b76be MV |
191 | OPT_CALLBACK('s', "strategy", &use_strategies, "strategy", |
192 | "merge strategy to use", option_parse_strategy), | |
8cc5b290 AP |
193 | OPT_CALLBACK('X', "strategy-option", &xopts, "option=value", |
194 | "option for selected merge strategy", option_parse_x), | |
1c7b76be MV |
195 | OPT_CALLBACK('m', "message", &merge_msg, "message", |
196 | "message to be used for the merge commit (if any)", | |
197 | option_parse_message), | |
7f87aff2 | 198 | OPT__VERBOSITY(&verbosity), |
1c7b76be MV |
199 | OPT_END() |
200 | }; | |
201 | ||
202 | /* Cleans up metadata that is uninteresting after a succeeded merge. */ | |
203 | static void drop_save(void) | |
204 | { | |
205 | unlink(git_path("MERGE_HEAD")); | |
206 | unlink(git_path("MERGE_MSG")); | |
cf10f9fd | 207 | unlink(git_path("MERGE_MODE")); |
1c7b76be MV |
208 | } |
209 | ||
210 | static void save_state(void) | |
211 | { | |
212 | int len; | |
213 | struct child_process cp; | |
214 | struct strbuf buffer = STRBUF_INIT; | |
215 | const char *argv[] = {"stash", "create", NULL}; | |
216 | ||
217 | memset(&cp, 0, sizeof(cp)); | |
218 | cp.argv = argv; | |
219 | cp.out = -1; | |
220 | cp.git_cmd = 1; | |
221 | ||
222 | if (start_command(&cp)) | |
223 | die("could not run stash."); | |
224 | len = strbuf_read(&buffer, cp.out, 1024); | |
225 | close(cp.out); | |
226 | ||
227 | if (finish_command(&cp) || len < 0) | |
228 | die("stash failed"); | |
229 | else if (!len) | |
230 | return; | |
231 | strbuf_setlen(&buffer, buffer.len-1); | |
232 | if (get_sha1(buffer.buf, stash)) | |
233 | die("not a valid object: %s", buffer.buf); | |
234 | } | |
235 | ||
236 | static void reset_hard(unsigned const char *sha1, int verbose) | |
237 | { | |
238 | int i = 0; | |
239 | const char *args[6]; | |
240 | ||
241 | args[i++] = "read-tree"; | |
242 | if (verbose) | |
243 | args[i++] = "-v"; | |
244 | args[i++] = "--reset"; | |
245 | args[i++] = "-u"; | |
246 | args[i++] = sha1_to_hex(sha1); | |
247 | args[i] = NULL; | |
248 | ||
249 | if (run_command_v_opt(args, RUN_GIT_CMD)) | |
250 | die("read-tree failed"); | |
251 | } | |
252 | ||
253 | static void restore_state(void) | |
254 | { | |
f285a2d7 | 255 | struct strbuf sb = STRBUF_INIT; |
1c7b76be MV |
256 | const char *args[] = { "stash", "apply", NULL, NULL }; |
257 | ||
258 | if (is_null_sha1(stash)) | |
259 | return; | |
260 | ||
261 | reset_hard(head, 1); | |
262 | ||
1c7b76be MV |
263 | args[2] = sha1_to_hex(stash); |
264 | ||
265 | /* | |
266 | * It is OK to ignore error here, for example when there was | |
267 | * nothing to restore. | |
268 | */ | |
269 | run_command_v_opt(args, RUN_GIT_CMD); | |
270 | ||
271 | strbuf_release(&sb); | |
272 | refresh_cache(REFRESH_QUIET); | |
273 | } | |
274 | ||
275 | /* This is called when no merge was necessary. */ | |
276 | static void finish_up_to_date(const char *msg) | |
277 | { | |
7f87aff2 TA |
278 | if (verbosity >= 0) |
279 | printf("%s%s\n", squash ? " (nothing to squash)" : "", msg); | |
1c7b76be MV |
280 | drop_save(); |
281 | } | |
282 | ||
283 | static void squash_message(void) | |
284 | { | |
285 | struct rev_info rev; | |
286 | struct commit *commit; | |
f285a2d7 | 287 | struct strbuf out = STRBUF_INIT; |
1c7b76be MV |
288 | struct commit_list *j; |
289 | int fd; | |
dd2e794a | 290 | struct pretty_print_context ctx = {0}; |
1c7b76be MV |
291 | |
292 | printf("Squash commit -- not updating HEAD\n"); | |
293 | fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666); | |
294 | if (fd < 0) | |
0721c314 | 295 | die_errno("Could not write to '%s'", git_path("SQUASH_MSG")); |
1c7b76be MV |
296 | |
297 | init_revisions(&rev, NULL); | |
298 | rev.ignore_merges = 1; | |
299 | rev.commit_format = CMIT_FMT_MEDIUM; | |
300 | ||
301 | commit = lookup_commit(head); | |
302 | commit->object.flags |= UNINTERESTING; | |
303 | add_pending_object(&rev, &commit->object, NULL); | |
304 | ||
305 | for (j = remoteheads; j; j = j->next) | |
306 | add_pending_object(&rev, &j->item->object, NULL); | |
307 | ||
308 | setup_revisions(0, NULL, &rev, NULL); | |
309 | if (prepare_revision_walk(&rev)) | |
310 | die("revision walk setup failed"); | |
311 | ||
dd2e794a TR |
312 | ctx.abbrev = rev.abbrev; |
313 | ctx.date_mode = rev.date_mode; | |
314 | ||
1c7b76be MV |
315 | strbuf_addstr(&out, "Squashed commit of the following:\n"); |
316 | while ((commit = get_revision(&rev)) != NULL) { | |
317 | strbuf_addch(&out, '\n'); | |
318 | strbuf_addf(&out, "commit %s\n", | |
319 | sha1_to_hex(commit->object.sha1)); | |
dd2e794a | 320 | pretty_print_commit(rev.commit_format, commit, &out, &ctx); |
1c7b76be | 321 | } |
47d32af2 | 322 | if (write(fd, out.buf, out.len) < 0) |
d824cbba | 323 | die_errno("Writing SQUASH_MSG"); |
47d32af2 | 324 | if (close(fd)) |
d824cbba | 325 | die_errno("Finishing SQUASH_MSG"); |
1c7b76be MV |
326 | strbuf_release(&out); |
327 | } | |
328 | ||
1c7b76be MV |
329 | static void finish(const unsigned char *new_head, const char *msg) |
330 | { | |
f285a2d7 | 331 | struct strbuf reflog_message = STRBUF_INIT; |
1c7b76be | 332 | |
1c7b76be MV |
333 | if (!msg) |
334 | strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION")); | |
335 | else { | |
7f87aff2 TA |
336 | if (verbosity >= 0) |
337 | printf("%s\n", msg); | |
1c7b76be MV |
338 | strbuf_addf(&reflog_message, "%s: %s", |
339 | getenv("GIT_REFLOG_ACTION"), msg); | |
340 | } | |
341 | if (squash) { | |
342 | squash_message(); | |
343 | } else { | |
7f87aff2 | 344 | if (verbosity >= 0 && !merge_msg.len) |
1c7b76be MV |
345 | printf("No merge message -- not updating HEAD\n"); |
346 | else { | |
347 | const char *argv_gc_auto[] = { "gc", "--auto", NULL }; | |
348 | update_ref(reflog_message.buf, "HEAD", | |
349 | new_head, head, 0, | |
350 | DIE_ON_ERR); | |
351 | /* | |
352 | * We ignore errors in 'gc --auto', since the | |
353 | * user should see them. | |
354 | */ | |
355 | run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); | |
356 | } | |
357 | } | |
358 | if (new_head && show_diffstat) { | |
359 | struct diff_options opts; | |
360 | diff_setup(&opts); | |
361 | opts.output_format |= | |
362 | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; | |
363 | opts.detect_rename = DIFF_DETECT_RENAME; | |
364 | if (diff_use_color_default > 0) | |
365 | DIFF_OPT_SET(&opts, COLOR_DIFF); | |
366 | if (diff_setup_done(&opts) < 0) | |
367 | die("diff_setup_done failed"); | |
368 | diff_tree_sha1(head, new_head, "", &opts); | |
369 | diffcore_std(&opts); | |
370 | diff_flush(&opts); | |
371 | } | |
372 | ||
373 | /* Run a post-merge hook */ | |
ae98a008 | 374 | run_hook(NULL, "post-merge", squash ? "1" : "0", NULL); |
1c7b76be MV |
375 | |
376 | strbuf_release(&reflog_message); | |
377 | } | |
378 | ||
379 | /* Get the name for the merge commit's message. */ | |
380 | static void merge_name(const char *remote, struct strbuf *msg) | |
381 | { | |
382 | struct object *remote_head; | |
383 | unsigned char branch_head[20], buf_sha[20]; | |
f285a2d7 | 384 | struct strbuf buf = STRBUF_INIT; |
c9717ee9 | 385 | struct strbuf bname = STRBUF_INIT; |
1c7b76be | 386 | const char *ptr; |
751c5974 | 387 | char *found_ref; |
1c7b76be MV |
388 | int len, early; |
389 | ||
a552de75 JH |
390 | strbuf_branchname(&bname, remote); |
391 | remote = bname.buf; | |
c9717ee9 | 392 | |
1c7b76be MV |
393 | memset(branch_head, 0, sizeof(branch_head)); |
394 | remote_head = peel_to_type(remote, 0, NULL, OBJ_COMMIT); | |
395 | if (!remote_head) | |
396 | die("'%s' does not point to a commit", remote); | |
397 | ||
751c5974 JK |
398 | if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) { |
399 | if (!prefixcmp(found_ref, "refs/heads/")) { | |
400 | strbuf_addf(msg, "%s\t\tbranch '%s' of .\n", | |
401 | sha1_to_hex(branch_head), remote); | |
402 | goto cleanup; | |
403 | } | |
69a8b7c7 JK |
404 | if (!prefixcmp(found_ref, "refs/remotes/")) { |
405 | strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n", | |
406 | sha1_to_hex(branch_head), remote); | |
407 | goto cleanup; | |
408 | } | |
1c7b76be MV |
409 | } |
410 | ||
411 | /* See if remote matches <name>^^^.. or <name>~<number> */ | |
412 | for (len = 0, ptr = remote + strlen(remote); | |
413 | remote < ptr && ptr[-1] == '^'; | |
414 | ptr--) | |
415 | len++; | |
416 | if (len) | |
417 | early = 1; | |
418 | else { | |
419 | early = 0; | |
420 | ptr = strrchr(remote, '~'); | |
421 | if (ptr) { | |
422 | int seen_nonzero = 0; | |
423 | ||
424 | len++; /* count ~ */ | |
425 | while (*++ptr && isdigit(*ptr)) { | |
426 | seen_nonzero |= (*ptr != '0'); | |
427 | len++; | |
428 | } | |
429 | if (*ptr) | |
430 | len = 0; /* not ...~<number> */ | |
431 | else if (seen_nonzero) | |
432 | early = 1; | |
433 | else if (len == 1) | |
434 | early = 1; /* "name~" is "name~1"! */ | |
435 | } | |
436 | } | |
437 | if (len) { | |
438 | struct strbuf truname = STRBUF_INIT; | |
439 | strbuf_addstr(&truname, "refs/heads/"); | |
440 | strbuf_addstr(&truname, remote); | |
9b6bf4d5 | 441 | strbuf_setlen(&truname, truname.len - len); |
b81f925f | 442 | if (resolve_ref(truname.buf, buf_sha, 1, NULL)) { |
1c7b76be MV |
443 | strbuf_addf(msg, |
444 | "%s\t\tbranch '%s'%s of .\n", | |
445 | sha1_to_hex(remote_head->sha1), | |
9b6bf4d5 | 446 | truname.buf + 11, |
1c7b76be | 447 | (early ? " (early part)" : "")); |
c9717ee9 JH |
448 | strbuf_release(&truname); |
449 | goto cleanup; | |
1c7b76be MV |
450 | } |
451 | } | |
452 | ||
453 | if (!strcmp(remote, "FETCH_HEAD") && | |
454 | !access(git_path("FETCH_HEAD"), R_OK)) { | |
455 | FILE *fp; | |
f285a2d7 | 456 | struct strbuf line = STRBUF_INIT; |
1c7b76be MV |
457 | char *ptr; |
458 | ||
1c7b76be MV |
459 | fp = fopen(git_path("FETCH_HEAD"), "r"); |
460 | if (!fp) | |
d824cbba TR |
461 | die_errno("could not open '%s' for reading", |
462 | git_path("FETCH_HEAD")); | |
1c7b76be MV |
463 | strbuf_getline(&line, fp, '\n'); |
464 | fclose(fp); | |
465 | ptr = strstr(line.buf, "\tnot-for-merge\t"); | |
466 | if (ptr) | |
467 | strbuf_remove(&line, ptr-line.buf+1, 13); | |
468 | strbuf_addbuf(msg, &line); | |
469 | strbuf_release(&line); | |
c9717ee9 | 470 | goto cleanup; |
1c7b76be MV |
471 | } |
472 | strbuf_addf(msg, "%s\t\tcommit '%s'\n", | |
473 | sha1_to_hex(remote_head->sha1), remote); | |
c9717ee9 JH |
474 | cleanup: |
475 | strbuf_release(&buf); | |
476 | strbuf_release(&bname); | |
1c7b76be MV |
477 | } |
478 | ||
186458b1 | 479 | static int git_merge_config(const char *k, const char *v, void *cb) |
1c7b76be MV |
480 | { |
481 | if (branch && !prefixcmp(k, "branch.") && | |
482 | !prefixcmp(k + 7, branch) && | |
483 | !strcmp(k + 7 + strlen(branch), ".mergeoptions")) { | |
484 | const char **argv; | |
485 | int argc; | |
486 | char *buf; | |
487 | ||
488 | buf = xstrdup(v); | |
489 | argc = split_cmdline(buf, &argv); | |
dc4179f9 | 490 | if (argc < 0) |
ad9ac6db GB |
491 | die("Bad branch.%s.mergeoptions string: %s", branch, |
492 | split_cmdline_strerror(argc)); | |
1c7b76be MV |
493 | argv = xrealloc(argv, sizeof(*argv) * (argc + 2)); |
494 | memmove(argv + 1, argv, sizeof(*argv) * (argc + 1)); | |
495 | argc++; | |
37782920 | 496 | parse_options(argc, argv, NULL, builtin_merge_options, |
1c7b76be MV |
497 | builtin_merge_usage, 0); |
498 | free(buf); | |
499 | } | |
500 | ||
501 | if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat")) | |
502 | show_diffstat = git_config_bool(k, v); | |
503 | else if (!strcmp(k, "pull.twohead")) | |
504 | return git_config_string(&pull_twohead, k, v); | |
505 | else if (!strcmp(k, "pull.octopus")) | |
506 | return git_config_string(&pull_octopus, k, v); | |
4393c237 JH |
507 | else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary")) |
508 | option_log = git_config_bool(k, v); | |
7610fa57 JN |
509 | else if (!strcmp(k, "merge.renormalize")) |
510 | option_renormalize = git_config_bool(k, v); | |
1c7b76be MV |
511 | return git_diff_ui_config(k, v, cb); |
512 | } | |
513 | ||
514 | static int read_tree_trivial(unsigned char *common, unsigned char *head, | |
515 | unsigned char *one) | |
516 | { | |
517 | int i, nr_trees = 0; | |
518 | struct tree *trees[MAX_UNPACK_TREES]; | |
519 | struct tree_desc t[MAX_UNPACK_TREES]; | |
520 | struct unpack_trees_options opts; | |
521 | ||
522 | memset(&opts, 0, sizeof(opts)); | |
523 | opts.head_idx = 2; | |
524 | opts.src_index = &the_index; | |
525 | opts.dst_index = &the_index; | |
526 | opts.update = 1; | |
527 | opts.verbose_update = 1; | |
528 | opts.trivial_merges_only = 1; | |
529 | opts.merge = 1; | |
530 | trees[nr_trees] = parse_tree_indirect(common); | |
531 | if (!trees[nr_trees++]) | |
532 | return -1; | |
533 | trees[nr_trees] = parse_tree_indirect(head); | |
534 | if (!trees[nr_trees++]) | |
535 | return -1; | |
536 | trees[nr_trees] = parse_tree_indirect(one); | |
537 | if (!trees[nr_trees++]) | |
538 | return -1; | |
539 | opts.fn = threeway_merge; | |
540 | cache_tree_free(&active_cache_tree); | |
541 | for (i = 0; i < nr_trees; i++) { | |
542 | parse_tree(trees[i]); | |
543 | init_tree_desc(t+i, trees[i]->buffer, trees[i]->size); | |
544 | } | |
545 | if (unpack_trees(nr_trees, t, &opts)) | |
546 | return -1; | |
547 | return 0; | |
548 | } | |
549 | ||
550 | static void write_tree_trivial(unsigned char *sha1) | |
551 | { | |
552 | if (write_cache_as_tree(sha1, 0, NULL)) | |
553 | die("git write-tree failed to write a tree"); | |
554 | } | |
555 | ||
c674d052 CC |
556 | int try_merge_command(const char *strategy, struct commit_list *common, |
557 | const char *head_arg, struct commit_list *remotes) | |
1c7b76be MV |
558 | { |
559 | const char **args; | |
8cc5b290 | 560 | int i = 0, x = 0, ret; |
1c7b76be | 561 | struct commit_list *j; |
f285a2d7 | 562 | struct strbuf buf = STRBUF_INIT; |
3f9083cd CC |
563 | |
564 | args = xmalloc((4 + xopts_nr + commit_list_count(common) + | |
565 | commit_list_count(remotes)) * sizeof(char *)); | |
566 | strbuf_addf(&buf, "merge-%s", strategy); | |
567 | args[i++] = buf.buf; | |
568 | for (x = 0; x < xopts_nr; x++) { | |
569 | char *s = xmalloc(strlen(xopts[x])+2+1); | |
570 | strcpy(s, "--"); | |
571 | strcpy(s+2, xopts[x]); | |
572 | args[i++] = s; | |
573 | } | |
574 | for (j = common; j; j = j->next) | |
575 | args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1)); | |
576 | args[i++] = "--"; | |
577 | args[i++] = head_arg; | |
578 | for (j = remotes; j; j = j->next) | |
579 | args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1)); | |
580 | args[i] = NULL; | |
581 | ret = run_command_v_opt(args, RUN_GIT_CMD); | |
582 | strbuf_release(&buf); | |
583 | i = 1; | |
584 | for (x = 0; x < xopts_nr; x++) | |
585 | free((void *)args[i++]); | |
586 | for (j = common; j; j = j->next) | |
587 | free((void *)args[i++]); | |
588 | i += 2; | |
589 | for (j = remotes; j; j = j->next) | |
590 | free((void *)args[i++]); | |
591 | free(args); | |
592 | discard_cache(); | |
593 | if (read_cache() < 0) | |
594 | die("failed to read the cache"); | |
595 | resolve_undo_clear(); | |
596 | ||
597 | return ret; | |
598 | } | |
599 | ||
600 | static int try_merge_strategy(const char *strategy, struct commit_list *common, | |
601 | const char *head_arg) | |
602 | { | |
668f26ff MV |
603 | int index_fd; |
604 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); | |
605 | ||
606 | index_fd = hold_locked_index(lock, 1); | |
607 | refresh_cache(REFRESH_QUIET); | |
608 | if (active_cache_changed && | |
609 | (write_cache(index_fd, active_cache, active_nr) || | |
610 | commit_locked_index(lock))) | |
611 | return error("Unable to write index."); | |
612 | rollback_lock_file(lock); | |
1c7b76be | 613 | |
18668f53 | 614 | if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) { |
3f9083cd | 615 | int clean, x; |
18668f53 MV |
616 | struct commit *result; |
617 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); | |
618 | int index_fd; | |
619 | struct commit_list *reversed = NULL; | |
620 | struct merge_options o; | |
3f9083cd | 621 | struct commit_list *j; |
18668f53 MV |
622 | |
623 | if (remoteheads->next) { | |
624 | error("Not handling anything other than two heads merge."); | |
625 | return 2; | |
626 | } | |
627 | ||
628 | init_merge_options(&o); | |
629 | if (!strcmp(strategy, "subtree")) | |
85e51b78 | 630 | o.subtree_shift = ""; |
8cc5b290 | 631 | |
7610fa57 JN |
632 | o.renormalize = option_renormalize; |
633 | ||
634 | /* | |
635 | * NEEDSWORK: merge with table in builtin/merge-recursive | |
636 | */ | |
8cc5b290 AP |
637 | for (x = 0; x < xopts_nr; x++) { |
638 | if (!strcmp(xopts[x], "ours")) | |
639 | o.recursive_variant = MERGE_RECURSIVE_OURS; | |
640 | else if (!strcmp(xopts[x], "theirs")) | |
641 | o.recursive_variant = MERGE_RECURSIVE_THEIRS; | |
642 | else if (!strcmp(xopts[x], "subtree")) | |
85e51b78 JH |
643 | o.subtree_shift = ""; |
644 | else if (!prefixcmp(xopts[x], "subtree=")) | |
645 | o.subtree_shift = xopts[x]+8; | |
7610fa57 JN |
646 | else if (!strcmp(xopts[x], "renormalize")) |
647 | o.renormalize = 1; | |
648 | else if (!strcmp(xopts[x], "no-renormalize")) | |
649 | o.renormalize = 0; | |
8cc5b290 AP |
650 | else |
651 | die("Unknown option for merge-recursive: -X%s", xopts[x]); | |
652 | } | |
18668f53 MV |
653 | |
654 | o.branch1 = head_arg; | |
655 | o.branch2 = remoteheads->item->util; | |
656 | ||
657 | for (j = common; j; j = j->next) | |
658 | commit_list_insert(j->item, &reversed); | |
659 | ||
660 | index_fd = hold_locked_index(lock, 1); | |
661 | clean = merge_recursive(&o, lookup_commit(head), | |
662 | remoteheads->item, reversed, &result); | |
663 | if (active_cache_changed && | |
664 | (write_cache(index_fd, active_cache, active_nr) || | |
665 | commit_locked_index(lock))) | |
666 | die ("unable to write %s", get_index_file()); | |
42716660 | 667 | rollback_lock_file(lock); |
18668f53 MV |
668 | return clean ? 0 : 1; |
669 | } else { | |
3f9083cd | 670 | return try_merge_command(strategy, common, head_arg, remoteheads); |
18668f53 | 671 | } |
1c7b76be MV |
672 | } |
673 | ||
674 | static void count_diff_files(struct diff_queue_struct *q, | |
675 | struct diff_options *opt, void *data) | |
676 | { | |
677 | int *count = data; | |
678 | ||
679 | (*count) += q->nr; | |
680 | } | |
681 | ||
682 | static int count_unmerged_entries(void) | |
683 | { | |
1c7b76be MV |
684 | int i, ret = 0; |
685 | ||
be6ff819 JH |
686 | for (i = 0; i < active_nr; i++) |
687 | if (ce_stage(active_cache[i])) | |
1c7b76be MV |
688 | ret++; |
689 | ||
690 | return ret; | |
691 | } | |
692 | ||
cac42b26 | 693 | int checkout_fast_forward(const unsigned char *head, const unsigned char *remote) |
1c7b76be MV |
694 | { |
695 | struct tree *trees[MAX_UNPACK_TREES]; | |
696 | struct unpack_trees_options opts; | |
697 | struct tree_desc t[MAX_UNPACK_TREES]; | |
698 | int i, fd, nr_trees = 0; | |
699 | struct dir_struct dir; | |
700 | struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); | |
701 | ||
9ca8f607 | 702 | refresh_cache(REFRESH_QUIET); |
1c7b76be MV |
703 | |
704 | fd = hold_locked_index(lock_file, 1); | |
705 | ||
706 | memset(&trees, 0, sizeof(trees)); | |
707 | memset(&opts, 0, sizeof(opts)); | |
708 | memset(&t, 0, sizeof(t)); | |
5d2299de | 709 | memset(&dir, 0, sizeof(dir)); |
7c4c97c0 | 710 | dir.flags |= DIR_SHOW_IGNORED; |
1c7b76be MV |
711 | dir.exclude_per_dir = ".gitignore"; |
712 | opts.dir = &dir; | |
713 | ||
714 | opts.head_idx = 1; | |
715 | opts.src_index = &the_index; | |
716 | opts.dst_index = &the_index; | |
717 | opts.update = 1; | |
718 | opts.verbose_update = 1; | |
719 | opts.merge = 1; | |
720 | opts.fn = twoway_merge; | |
e294030f | 721 | setup_unpack_trees_porcelain(&opts, "merge"); |
1c7b76be MV |
722 | |
723 | trees[nr_trees] = parse_tree_indirect(head); | |
724 | if (!trees[nr_trees++]) | |
725 | return -1; | |
726 | trees[nr_trees] = parse_tree_indirect(remote); | |
727 | if (!trees[nr_trees++]) | |
728 | return -1; | |
729 | for (i = 0; i < nr_trees; i++) { | |
730 | parse_tree(trees[i]); | |
731 | init_tree_desc(t+i, trees[i]->buffer, trees[i]->size); | |
732 | } | |
733 | if (unpack_trees(nr_trees, t, &opts)) | |
734 | return -1; | |
735 | if (write_cache(fd, active_cache, active_nr) || | |
736 | commit_locked_index(lock_file)) | |
737 | die("unable to write new index file"); | |
738 | return 0; | |
739 | } | |
740 | ||
741 | static void split_merge_strategies(const char *string, struct strategy **list, | |
742 | int *nr, int *alloc) | |
743 | { | |
744 | char *p, *q, *buf; | |
745 | ||
746 | if (!string) | |
747 | return; | |
748 | ||
749 | buf = xstrdup(string); | |
750 | q = buf; | |
751 | for (;;) { | |
752 | p = strchr(q, ' '); | |
753 | if (!p) { | |
754 | ALLOC_GROW(*list, *nr + 1, *alloc); | |
755 | (*list)[(*nr)++].name = xstrdup(q); | |
756 | free(buf); | |
757 | return; | |
758 | } else { | |
759 | *p = '\0'; | |
760 | ALLOC_GROW(*list, *nr + 1, *alloc); | |
761 | (*list)[(*nr)++].name = xstrdup(q); | |
762 | q = ++p; | |
763 | } | |
764 | } | |
765 | } | |
766 | ||
767 | static void add_strategies(const char *string, unsigned attr) | |
768 | { | |
769 | struct strategy *list = NULL; | |
770 | int list_alloc = 0, list_nr = 0, i; | |
771 | ||
772 | memset(&list, 0, sizeof(list)); | |
773 | split_merge_strategies(string, &list, &list_nr, &list_alloc); | |
1719b5e4 MV |
774 | if (list) { |
775 | for (i = 0; i < list_nr; i++) | |
776 | append_strategy(get_strategy(list[i].name)); | |
1c7b76be MV |
777 | return; |
778 | } | |
779 | for (i = 0; i < ARRAY_SIZE(all_strategy); i++) | |
780 | if (all_strategy[i].attr & attr) | |
781 | append_strategy(&all_strategy[i]); | |
782 | ||
783 | } | |
784 | ||
785 | static int merge_trivial(void) | |
786 | { | |
787 | unsigned char result_tree[20], result_commit[20]; | |
36e40535 | 788 | struct commit_list *parent = xmalloc(sizeof(*parent)); |
1c7b76be MV |
789 | |
790 | write_tree_trivial(result_tree); | |
791 | printf("Wonderful.\n"); | |
446247db | 792 | parent->item = lookup_commit(head); |
36e40535 | 793 | parent->next = xmalloc(sizeof(*parent->next)); |
446247db JH |
794 | parent->next->item = remoteheads->item; |
795 | parent->next->next = NULL; | |
ee20a129 | 796 | commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL); |
1c7b76be MV |
797 | finish(result_commit, "In-index merge"); |
798 | drop_save(); | |
799 | return 0; | |
800 | } | |
801 | ||
802 | static int finish_automerge(struct commit_list *common, | |
803 | unsigned char *result_tree, | |
804 | const char *wt_strategy) | |
805 | { | |
806 | struct commit_list *parents = NULL, *j; | |
807 | struct strbuf buf = STRBUF_INIT; | |
808 | unsigned char result_commit[20]; | |
809 | ||
810 | free_commit_list(common); | |
811 | if (allow_fast_forward) { | |
812 | parents = remoteheads; | |
813 | commit_list_insert(lookup_commit(head), &parents); | |
814 | parents = reduce_heads(parents); | |
815 | } else { | |
816 | struct commit_list **pptr = &parents; | |
817 | ||
818 | pptr = &commit_list_insert(lookup_commit(head), | |
819 | pptr)->next; | |
820 | for (j = remoteheads; j; j = j->next) | |
821 | pptr = &commit_list_insert(j->item, pptr)->next; | |
822 | } | |
823 | free_commit_list(remoteheads); | |
824 | strbuf_addch(&merge_msg, '\n'); | |
ee20a129 | 825 | commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL); |
1c7b76be MV |
826 | strbuf_addf(&buf, "Merge made by %s.", wt_strategy); |
827 | finish(result_commit, buf.buf); | |
828 | strbuf_release(&buf); | |
829 | drop_save(); | |
830 | return 0; | |
831 | } | |
832 | ||
7610fa57 | 833 | static int suggest_conflicts(int renormalizing) |
1c7b76be MV |
834 | { |
835 | FILE *fp; | |
836 | int pos; | |
837 | ||
838 | fp = fopen(git_path("MERGE_MSG"), "a"); | |
839 | if (!fp) | |
0721c314 TR |
840 | die_errno("Could not open '%s' for writing", |
841 | git_path("MERGE_MSG")); | |
1c7b76be MV |
842 | fprintf(fp, "\nConflicts:\n"); |
843 | for (pos = 0; pos < active_nr; pos++) { | |
844 | struct cache_entry *ce = active_cache[pos]; | |
845 | ||
846 | if (ce_stage(ce)) { | |
847 | fprintf(fp, "\t%s\n", ce->name); | |
848 | while (pos + 1 < active_nr && | |
849 | !strcmp(ce->name, | |
850 | active_cache[pos + 1]->name)) | |
851 | pos++; | |
852 | } | |
853 | } | |
854 | fclose(fp); | |
cb6020bb | 855 | rerere(allow_rerere_auto); |
1c7b76be MV |
856 | printf("Automatic merge failed; " |
857 | "fix conflicts and then commit the result.\n"); | |
858 | return 1; | |
859 | } | |
860 | ||
861 | static struct commit *is_old_style_invocation(int argc, const char **argv) | |
862 | { | |
863 | struct commit *second_token = NULL; | |
76bf488e | 864 | if (argc > 2) { |
1c7b76be MV |
865 | unsigned char second_sha1[20]; |
866 | ||
867 | if (get_sha1(argv[1], second_sha1)) | |
868 | return NULL; | |
869 | second_token = lookup_commit_reference_gently(second_sha1, 0); | |
870 | if (!second_token) | |
871 | die("'%s' is not a commit", argv[1]); | |
872 | if (hashcmp(second_token->object.sha1, head)) | |
873 | return NULL; | |
874 | } | |
875 | return second_token; | |
876 | } | |
877 | ||
878 | static int evaluate_result(void) | |
879 | { | |
880 | int cnt = 0; | |
881 | struct rev_info rev; | |
882 | ||
1c7b76be MV |
883 | /* Check how many files differ. */ |
884 | init_revisions(&rev, ""); | |
885 | setup_revisions(0, NULL, &rev, NULL); | |
886 | rev.diffopt.output_format |= | |
887 | DIFF_FORMAT_CALLBACK; | |
888 | rev.diffopt.format_callback = count_diff_files; | |
889 | rev.diffopt.format_callback_data = &cnt; | |
890 | run_diff_files(&rev, 0); | |
891 | ||
892 | /* | |
893 | * Check how many unmerged entries are | |
894 | * there. | |
895 | */ | |
896 | cnt += count_unmerged_entries(); | |
897 | ||
898 | return cnt; | |
899 | } | |
900 | ||
901 | int cmd_merge(int argc, const char **argv, const char *prefix) | |
902 | { | |
903 | unsigned char result_tree[20]; | |
f285a2d7 | 904 | struct strbuf buf = STRBUF_INIT; |
1c7b76be MV |
905 | const char *head_arg; |
906 | int flag, head_invalid = 0, i; | |
907 | int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0; | |
908 | struct commit_list *common = NULL; | |
909 | const char *best_strategy = NULL, *wt_strategy = NULL; | |
910 | struct commit_list **remotes = &remoteheads; | |
911 | ||
d38a30df MM |
912 | if (read_cache_unmerged()) { |
913 | die_resolve_conflict("merge"); | |
914 | } | |
915 | if (file_exists(git_path("MERGE_HEAD"))) { | |
916 | /* | |
917 | * There is no unmerged entry, don't advise 'git | |
918 | * add/rm <file>', just 'git commit'. | |
919 | */ | |
920 | if (advice_resolve_conflict) | |
921 | die("You have not concluded your merge (MERGE_HEAD exists).\n" | |
922 | "Please, commit your changes before you can merge."); | |
923 | else | |
924 | die("You have not concluded your merge (MERGE_HEAD exists)."); | |
925 | } | |
1c7b76be | 926 | |
cfc5789a | 927 | resolve_undo_clear(); |
1c7b76be MV |
928 | /* |
929 | * Check if we are _not_ on a detached HEAD, i.e. if there is a | |
930 | * current branch. | |
931 | */ | |
932 | branch = resolve_ref("HEAD", head, 0, &flag); | |
933 | if (branch && !prefixcmp(branch, "refs/heads/")) | |
934 | branch += 11; | |
935 | if (is_null_sha1(head)) | |
936 | head_invalid = 1; | |
937 | ||
938 | git_config(git_merge_config, NULL); | |
939 | ||
940 | /* for color.ui */ | |
941 | if (diff_use_color_default == -1) | |
942 | diff_use_color_default = git_use_color_default; | |
943 | ||
37782920 | 944 | argc = parse_options(argc, argv, prefix, builtin_merge_options, |
1c7b76be | 945 | builtin_merge_usage, 0); |
7f87aff2 TA |
946 | if (verbosity < 0) |
947 | show_diffstat = 0; | |
1c7b76be MV |
948 | |
949 | if (squash) { | |
950 | if (!allow_fast_forward) | |
951 | die("You cannot combine --squash with --no-ff."); | |
952 | option_commit = 0; | |
953 | } | |
954 | ||
13474835 BG |
955 | if (!allow_fast_forward && fast_forward_only) |
956 | die("You cannot combine --no-ff with --ff-only."); | |
957 | ||
1c7b76be MV |
958 | if (!argc) |
959 | usage_with_options(builtin_merge_usage, | |
960 | builtin_merge_options); | |
961 | ||
962 | /* | |
963 | * This could be traditional "merge <msg> HEAD <commit>..." and | |
964 | * the way we can tell it is to see if the second token is HEAD, | |
965 | * but some people might have misused the interface and used a | |
966 | * committish that is the same as HEAD there instead. | |
967 | * Traditional format never would have "-m" so it is an | |
968 | * additional safety measure to check for it. | |
969 | */ | |
1c7b76be MV |
970 | |
971 | if (!have_message && is_old_style_invocation(argc, argv)) { | |
972 | strbuf_addstr(&merge_msg, argv[0]); | |
973 | head_arg = argv[1]; | |
974 | argv += 2; | |
975 | argc -= 2; | |
976 | } else if (head_invalid) { | |
977 | struct object *remote_head; | |
978 | /* | |
979 | * If the merged head is a valid one there is no reason | |
980 | * to forbid "git merge" into a branch yet to be born. | |
981 | * We do the same for "git pull". | |
982 | */ | |
983 | if (argc != 1) | |
984 | die("Can merge only exactly one commit into " | |
985 | "empty head"); | |
4be636f4 PB |
986 | if (squash) |
987 | die("Squash commit into empty head not supported yet"); | |
988 | if (!allow_fast_forward) | |
989 | die("Non-fast-forward commit does not make sense into " | |
990 | "an empty head"); | |
1c7b76be MV |
991 | remote_head = peel_to_type(argv[0], 0, NULL, OBJ_COMMIT); |
992 | if (!remote_head) | |
993 | die("%s - not something we can merge", argv[0]); | |
994 | update_ref("initial pull", "HEAD", remote_head->sha1, NULL, 0, | |
995 | DIE_ON_ERR); | |
996 | reset_hard(remote_head->sha1, 0); | |
997 | return 0; | |
998 | } else { | |
97d45bcb | 999 | struct strbuf merge_names = STRBUF_INIT; |
1c7b76be MV |
1000 | |
1001 | /* We are invoked directly as the first-class UI. */ | |
1002 | head_arg = "HEAD"; | |
1003 | ||
1004 | /* | |
1005 | * All the rest are the commits being merged; | |
1006 | * prepare the standard merge summary message to | |
1007 | * be appended to the given message. If remote | |
1008 | * is invalid we will die later in the common | |
1009 | * codepath so we discard the error in this | |
1010 | * loop. | |
1011 | */ | |
f0ecac2b TRC |
1012 | for (i = 0; i < argc; i++) |
1013 | merge_name(argv[i], &merge_names); | |
1014 | ||
1015 | if (have_message && option_log) | |
1016 | fmt_merge_msg_shortlog(&merge_names, &merge_msg); | |
1017 | else if (!have_message) | |
97d45bcb | 1018 | fmt_merge_msg(option_log, &merge_names, &merge_msg); |
f0ecac2b TRC |
1019 | |
1020 | ||
1021 | if (!(have_message && !option_log) && merge_msg.len) | |
1022 | strbuf_setlen(&merge_msg, merge_msg.len-1); | |
1c7b76be MV |
1023 | } |
1024 | ||
1025 | if (head_invalid || !argc) | |
1026 | usage_with_options(builtin_merge_usage, | |
1027 | builtin_merge_options); | |
1028 | ||
1029 | strbuf_addstr(&buf, "merge"); | |
1030 | for (i = 0; i < argc; i++) | |
1031 | strbuf_addf(&buf, " %s", argv[i]); | |
1032 | setenv("GIT_REFLOG_ACTION", buf.buf, 0); | |
1033 | strbuf_reset(&buf); | |
1034 | ||
1035 | for (i = 0; i < argc; i++) { | |
1036 | struct object *o; | |
18668f53 | 1037 | struct commit *commit; |
1c7b76be MV |
1038 | |
1039 | o = peel_to_type(argv[i], 0, NULL, OBJ_COMMIT); | |
1040 | if (!o) | |
1041 | die("%s - not something we can merge", argv[i]); | |
18668f53 MV |
1042 | commit = lookup_commit(o->sha1); |
1043 | commit->util = (void *)argv[i]; | |
1044 | remotes = &commit_list_insert(commit, remotes)->next; | |
1c7b76be MV |
1045 | |
1046 | strbuf_addf(&buf, "GITHEAD_%s", sha1_to_hex(o->sha1)); | |
1047 | setenv(buf.buf, argv[i], 1); | |
1048 | strbuf_reset(&buf); | |
1049 | } | |
1050 | ||
1051 | if (!use_strategies) { | |
1052 | if (!remoteheads->next) | |
1053 | add_strategies(pull_twohead, DEFAULT_TWOHEAD); | |
1054 | else | |
1055 | add_strategies(pull_octopus, DEFAULT_OCTOPUS); | |
1056 | } | |
1057 | ||
1058 | for (i = 0; i < use_strategies_nr; i++) { | |
1059 | if (use_strategies[i]->attr & NO_FAST_FORWARD) | |
1060 | allow_fast_forward = 0; | |
1061 | if (use_strategies[i]->attr & NO_TRIVIAL) | |
1062 | allow_trivial = 0; | |
1063 | } | |
1064 | ||
1065 | if (!remoteheads->next) | |
1066 | common = get_merge_bases(lookup_commit(head), | |
1067 | remoteheads->item, 1); | |
1068 | else { | |
1069 | struct commit_list *list = remoteheads; | |
1070 | commit_list_insert(lookup_commit(head), &list); | |
1071 | common = get_octopus_merge_bases(list); | |
1072 | free(list); | |
1073 | } | |
1074 | ||
1075 | update_ref("updating ORIG_HEAD", "ORIG_HEAD", head, NULL, 0, | |
1076 | DIE_ON_ERR); | |
1077 | ||
1078 | if (!common) | |
1079 | ; /* No common ancestors found. We need a real merge. */ | |
1080 | else if (!remoteheads->next && !common->next && | |
1081 | common->item == remoteheads->item) { | |
1082 | /* | |
1083 | * If head can reach all the merge then we are up to date. | |
1084 | * but first the most common case of merging one remote. | |
1085 | */ | |
1086 | finish_up_to_date("Already up-to-date."); | |
1087 | return 0; | |
1088 | } else if (allow_fast_forward && !remoteheads->next && | |
1089 | !common->next && | |
1090 | !hashcmp(common->item->object.sha1, head)) { | |
1091 | /* Again the most common case of merging one remote. */ | |
f285a2d7 | 1092 | struct strbuf msg = STRBUF_INIT; |
1c7b76be MV |
1093 | struct object *o; |
1094 | char hex[41]; | |
1095 | ||
1096 | strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV)); | |
1097 | ||
7f87aff2 TA |
1098 | if (verbosity >= 0) |
1099 | printf("Updating %s..%s\n", | |
1100 | hex, | |
1101 | find_unique_abbrev(remoteheads->item->object.sha1, | |
1102 | DEFAULT_ABBREV)); | |
a75d7b54 | 1103 | strbuf_addstr(&msg, "Fast-forward"); |
1c7b76be MV |
1104 | if (have_message) |
1105 | strbuf_addstr(&msg, | |
1106 | " (no commit created; -m option ignored)"); | |
1107 | o = peel_to_type(sha1_to_hex(remoteheads->item->object.sha1), | |
1108 | 0, NULL, OBJ_COMMIT); | |
1109 | if (!o) | |
1110 | return 1; | |
1111 | ||
1112 | if (checkout_fast_forward(head, remoteheads->item->object.sha1)) | |
1113 | return 1; | |
1114 | ||
1115 | finish(o->sha1, msg.buf); | |
1116 | drop_save(); | |
1117 | return 0; | |
1118 | } else if (!remoteheads->next && common->next) | |
1119 | ; | |
1120 | /* | |
a75d7b54 | 1121 | * We are not doing octopus and not fast-forward. Need |
1c7b76be MV |
1122 | * a real merge. |
1123 | */ | |
1124 | else if (!remoteheads->next && !common->next && option_commit) { | |
1125 | /* | |
a75d7b54 | 1126 | * We are not doing octopus, not fast-forward, and have |
1c7b76be MV |
1127 | * only one common. |
1128 | */ | |
1129 | refresh_cache(REFRESH_QUIET); | |
13474835 | 1130 | if (allow_trivial && !fast_forward_only) { |
1c7b76be MV |
1131 | /* See if it is really trivial. */ |
1132 | git_committer_info(IDENT_ERROR_ON_NO_NAME); | |
1133 | printf("Trying really trivial in-index merge...\n"); | |
1134 | if (!read_tree_trivial(common->item->object.sha1, | |
1135 | head, remoteheads->item->object.sha1)) | |
1136 | return merge_trivial(); | |
1137 | printf("Nope.\n"); | |
1138 | } | |
1139 | } else { | |
1140 | /* | |
1141 | * An octopus. If we can reach all the remote we are up | |
1142 | * to date. | |
1143 | */ | |
1144 | int up_to_date = 1; | |
1145 | struct commit_list *j; | |
1146 | ||
1147 | for (j = remoteheads; j; j = j->next) { | |
1148 | struct commit_list *common_one; | |
1149 | ||
1150 | /* | |
1151 | * Here we *have* to calculate the individual | |
1152 | * merge_bases again, otherwise "git merge HEAD^ | |
1153 | * HEAD^^" would be missed. | |
1154 | */ | |
1155 | common_one = get_merge_bases(lookup_commit(head), | |
1156 | j->item, 1); | |
1157 | if (hashcmp(common_one->item->object.sha1, | |
1158 | j->item->object.sha1)) { | |
1159 | up_to_date = 0; | |
1160 | break; | |
1161 | } | |
1162 | } | |
1163 | if (up_to_date) { | |
1164 | finish_up_to_date("Already up-to-date. Yeeah!"); | |
1165 | return 0; | |
1166 | } | |
1167 | } | |
1168 | ||
13474835 | 1169 | if (fast_forward_only) |
4d8c3258 | 1170 | die("Not possible to fast-forward, aborting."); |
13474835 | 1171 | |
1c7b76be MV |
1172 | /* We are going to make a new commit. */ |
1173 | git_committer_info(IDENT_ERROR_ON_NO_NAME); | |
1174 | ||
1175 | /* | |
1176 | * At this point, we need a real merge. No matter what strategy | |
1177 | * we use, it would operate on the index, possibly affecting the | |
1178 | * working tree, and when resolved cleanly, have the desired | |
1179 | * tree in the index -- this means that the index must be in | |
1180 | * sync with the head commit. The strategies are responsible | |
1181 | * to ensure this. | |
1182 | */ | |
1183 | if (use_strategies_nr != 1) { | |
1184 | /* | |
1185 | * Stash away the local changes so that we can try more | |
1186 | * than one. | |
1187 | */ | |
1188 | save_state(); | |
1189 | } else { | |
1190 | memcpy(stash, null_sha1, 20); | |
1191 | } | |
1192 | ||
1193 | for (i = 0; i < use_strategies_nr; i++) { | |
1194 | int ret; | |
1195 | if (i) { | |
1196 | printf("Rewinding the tree to pristine...\n"); | |
1197 | restore_state(); | |
1198 | } | |
1199 | if (use_strategies_nr != 1) | |
1200 | printf("Trying merge strategy %s...\n", | |
1201 | use_strategies[i]->name); | |
1202 | /* | |
1203 | * Remember which strategy left the state in the working | |
1204 | * tree. | |
1205 | */ | |
1206 | wt_strategy = use_strategies[i]->name; | |
1207 | ||
1208 | ret = try_merge_strategy(use_strategies[i]->name, | |
1209 | common, head_arg); | |
1210 | if (!option_commit && !ret) { | |
1211 | merge_was_ok = 1; | |
1212 | /* | |
1213 | * This is necessary here just to avoid writing | |
1214 | * the tree, but later we will *not* exit with | |
1215 | * status code 1 because merge_was_ok is set. | |
1216 | */ | |
1217 | ret = 1; | |
1218 | } | |
1219 | ||
1220 | if (ret) { | |
1221 | /* | |
1222 | * The backend exits with 1 when conflicts are | |
1223 | * left to be resolved, with 2 when it does not | |
1224 | * handle the given merge at all. | |
1225 | */ | |
1226 | if (ret == 1) { | |
1227 | int cnt = evaluate_result(); | |
1228 | ||
1229 | if (best_cnt <= 0 || cnt <= best_cnt) { | |
1230 | best_strategy = use_strategies[i]->name; | |
1231 | best_cnt = cnt; | |
1232 | } | |
1233 | } | |
1234 | if (merge_was_ok) | |
1235 | break; | |
1236 | else | |
1237 | continue; | |
1238 | } | |
1239 | ||
1240 | /* Automerge succeeded. */ | |
1241 | write_tree_trivial(result_tree); | |
1242 | automerge_was_ok = 1; | |
1243 | break; | |
1244 | } | |
1245 | ||
1246 | /* | |
1247 | * If we have a resulting tree, that means the strategy module | |
1248 | * auto resolved the merge cleanly. | |
1249 | */ | |
1250 | if (automerge_was_ok) | |
1251 | return finish_automerge(common, result_tree, wt_strategy); | |
1252 | ||
1253 | /* | |
1254 | * Pick the result from the best strategy and have the user fix | |
1255 | * it up. | |
1256 | */ | |
1257 | if (!best_strategy) { | |
1258 | restore_state(); | |
1259 | if (use_strategies_nr > 1) | |
1260 | fprintf(stderr, | |
1261 | "No merge strategy handled the merge.\n"); | |
1262 | else | |
1263 | fprintf(stderr, "Merge with strategy %s failed.\n", | |
1264 | use_strategies[0]->name); | |
1265 | return 2; | |
1266 | } else if (best_strategy == wt_strategy) | |
1267 | ; /* We already have its result in the working tree. */ | |
1268 | else { | |
1269 | printf("Rewinding the tree to pristine...\n"); | |
1270 | restore_state(); | |
1271 | printf("Using the %s to prepare resolving by hand.\n", | |
1272 | best_strategy); | |
1273 | try_merge_strategy(best_strategy, common, head_arg); | |
1274 | } | |
1275 | ||
1276 | if (squash) | |
1277 | finish(NULL, NULL); | |
1278 | else { | |
1279 | int fd; | |
1280 | struct commit_list *j; | |
1281 | ||
1282 | for (j = remoteheads; j; j = j->next) | |
1283 | strbuf_addf(&buf, "%s\n", | |
1284 | sha1_to_hex(j->item->object.sha1)); | |
1285 | fd = open(git_path("MERGE_HEAD"), O_WRONLY | O_CREAT, 0666); | |
1286 | if (fd < 0) | |
0721c314 TR |
1287 | die_errno("Could not open '%s' for writing", |
1288 | git_path("MERGE_HEAD")); | |
1c7b76be | 1289 | if (write_in_full(fd, buf.buf, buf.len) != buf.len) |
0721c314 | 1290 | die_errno("Could not write to '%s'", git_path("MERGE_HEAD")); |
1c7b76be MV |
1291 | close(fd); |
1292 | strbuf_addch(&merge_msg, '\n'); | |
1293 | fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666); | |
1294 | if (fd < 0) | |
0721c314 TR |
1295 | die_errno("Could not open '%s' for writing", |
1296 | git_path("MERGE_MSG")); | |
1c7b76be MV |
1297 | if (write_in_full(fd, merge_msg.buf, merge_msg.len) != |
1298 | merge_msg.len) | |
0721c314 | 1299 | die_errno("Could not write to '%s'", git_path("MERGE_MSG")); |
1c7b76be | 1300 | close(fd); |
cf10f9fd MV |
1301 | fd = open(git_path("MERGE_MODE"), O_WRONLY | O_CREAT | O_TRUNC, 0666); |
1302 | if (fd < 0) | |
0721c314 TR |
1303 | die_errno("Could not open '%s' for writing", |
1304 | git_path("MERGE_MODE")); | |
cf10f9fd MV |
1305 | strbuf_reset(&buf); |
1306 | if (!allow_fast_forward) | |
1307 | strbuf_addf(&buf, "no-ff"); | |
1308 | if (write_in_full(fd, buf.buf, buf.len) != buf.len) | |
0721c314 | 1309 | die_errno("Could not write to '%s'", git_path("MERGE_MODE")); |
cf10f9fd | 1310 | close(fd); |
1c7b76be MV |
1311 | } |
1312 | ||
1313 | if (merge_was_ok) { | |
1314 | fprintf(stderr, "Automatic merge went well; " | |
1315 | "stopped before committing as requested\n"); | |
1316 | return 0; | |
1317 | } else | |
7610fa57 | 1318 | return suggest_conflicts(option_renormalize); |
1c7b76be | 1319 | } |