pull: Fix parsing of -X<option>
[git/git.git] / merge-recursive.c
CommitLineData
9047ebbc
MV
1/*
2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
3 * Fredrik Kuivinen.
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5 */
4c371f91 6#include "advice.h"
9047ebbc
MV
7#include "cache.h"
8#include "cache-tree.h"
9#include "commit.h"
10#include "blob.h"
11#include "builtin.h"
12#include "tree-walk.h"
13#include "diff.h"
14#include "diffcore.h"
15#include "tag.h"
16#include "unpack-trees.h"
17#include "string-list.h"
18#include "xdiff-interface.h"
19#include "ll-merge.h"
9047ebbc
MV
20#include "attr.h"
21#include "merge-recursive.h"
9800c0df 22#include "dir.h"
9047ebbc 23
9047ebbc
MV
24static struct tree *shift_tree_object(struct tree *one, struct tree *two)
25{
26 unsigned char shifted[20];
27
28 /*
29 * NEEDSWORK: this limits the recursion depth to hardcoded
30 * value '2' to avoid excessive overhead.
31 */
32 shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
33 if (!hashcmp(two->object.sha1, shifted))
34 return two;
35 return lookup_tree(shifted);
36}
37
38/*
a6f63ae0 39 * A virtual commit has (const char *)commit->util set to the name.
9047ebbc
MV
40 */
41
2af202be 42static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
9047ebbc
MV
43{
44 struct commit *commit = xcalloc(1, sizeof(struct commit));
9047ebbc
MV
45 commit->tree = tree;
46 commit->util = (void*)comment;
9047ebbc
MV
47 /* avoid warnings */
48 commit->object.parsed = 1;
49 return commit;
50}
51
52/*
53 * Since we use get_tree_entry(), which does not put the read object into
54 * the object pool, we cannot rely on a == b.
55 */
56static int sha_eq(const unsigned char *a, const unsigned char *b)
57{
58 if (!a && !b)
59 return 2;
60 return a && b && hashcmp(a, b) == 0;
61}
62
63/*
64 * Since we want to write the index eventually, we cannot reuse the index
65 * for these (temporary) data.
66 */
67struct stage_data
68{
69 struct
70 {
71 unsigned mode;
72 unsigned char sha[20];
73 } stages[4];
74 unsigned processed:1;
75};
76
8a2fce18 77static int show(struct merge_options *o, int v)
9047ebbc 78{
5033639c 79 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
80}
81
c7d84924 82static void flush_output(struct merge_options *o)
9047ebbc 83{
c7d84924
MV
84 if (o->obuf.len) {
85 fputs(o->obuf.buf, stdout);
86 strbuf_reset(&o->obuf);
9047ebbc
MV
87 }
88}
89
28bea9e5 90__attribute__((format (printf, 3, 4)))
8a2fce18 91static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc
MV
92{
93 int len;
94 va_list ap;
95
8a2fce18 96 if (!show(o, v))
9047ebbc
MV
97 return;
98
c7d84924
MV
99 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
100 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
101 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
9047ebbc
MV
102
103 va_start(ap, fmt);
c7d84924 104 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
9047ebbc
MV
105 va_end(ap);
106
107 if (len < 0)
108 len = 0;
c7d84924
MV
109 if (len >= strbuf_avail(&o->obuf)) {
110 strbuf_grow(&o->obuf, len + 2);
9047ebbc 111 va_start(ap, fmt);
c7d84924 112 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
9047ebbc 113 va_end(ap);
c7d84924 114 if (len >= strbuf_avail(&o->obuf)) {
9047ebbc
MV
115 die("this should not happen, your snprintf is broken");
116 }
117 }
c7d84924
MV
118 strbuf_setlen(&o->obuf, o->obuf.len + len);
119 strbuf_add(&o->obuf, "\n", 1);
8a2fce18 120 if (!o->buffer_output)
c7d84924 121 flush_output(o);
9047ebbc
MV
122}
123
5033639c 124static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc
MV
125{
126 int i;
c7d84924 127 flush_output(o);
5033639c 128 for (i = o->call_depth; i--;)
9047ebbc
MV
129 fputs(" ", stdout);
130 if (commit->util)
131 printf("virtual %s\n", (char *)commit->util);
132 else {
133 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
134 if (parse_commit(commit) != 0)
135 printf("(bad commit)\n");
136 else {
137 const char *s;
138 int len;
139 for (s = commit->buffer; *s; s++)
140 if (*s == '\n' && s[1] == '\n') {
141 s += 2;
142 break;
143 }
144 for (len = 0; s[len] && '\n' != s[len]; len++)
145 ; /* do nothing */
146 printf("%.*s\n", len, s);
147 }
148 }
149}
150
151static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
152 const char *path, int stage, int refresh, int options)
153{
154 struct cache_entry *ce;
155 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
156 if (!ce)
157 return error("addinfo_cache failed for path '%s'", path);
158 return add_cache_entry(ce, options);
159}
160
9047ebbc
MV
161static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
162{
163 parse_tree(tree);
164 init_tree_desc(desc, tree->buffer, tree->size);
165}
166
167static int git_merge_trees(int index_only,
168 struct tree *common,
169 struct tree *head,
170 struct tree *merge)
171{
172 int rc;
173 struct tree_desc t[3];
174 struct unpack_trees_options opts;
4c371f91 175 struct unpack_trees_error_msgs msgs = {
fadd069d
JH
176 /* would_overwrite */
177 "Your local changes to '%s' would be overwritten by merge. Aborting.",
178 /* not_uptodate_file */
179 "Your local changes to '%s' would be overwritten by merge. Aborting.",
180 /* not_uptodate_dir */
181 "Updating '%s' would lose untracked files in it. Aborting.",
182 /* would_lose_untracked */
183 "Untracked working tree file '%s' would be %s by merge. Aborting",
184 /* bind_overlap -- will not happen here */
185 NULL,
186 };
4c371f91
MM
187 if (advice_commit_before_merge) {
188 msgs.would_overwrite = msgs.not_uptodate_file =
189 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
190 "Please, commit your changes or stash them before you can merge.";
191 }
9047ebbc
MV
192
193 memset(&opts, 0, sizeof(opts));
194 if (index_only)
195 opts.index_only = 1;
196 else
197 opts.update = 1;
198 opts.merge = 1;
199 opts.head_idx = 2;
200 opts.fn = threeway_merge;
201 opts.src_index = &the_index;
202 opts.dst_index = &the_index;
fadd069d 203 opts.msgs = msgs;
9047ebbc
MV
204
205 init_tree_desc_from_tree(t+0, common);
206 init_tree_desc_from_tree(t+1, head);
207 init_tree_desc_from_tree(t+2, merge);
208
209 rc = unpack_trees(3, t, &opts);
210 cache_tree_free(&active_cache_tree);
211 return rc;
212}
213
8a2fce18 214struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
215{
216 struct tree *result = NULL;
217
218 if (unmerged_cache()) {
219 int i;
8a2fce18 220 output(o, 0, "There are unmerged index entries:");
9047ebbc
MV
221 for (i = 0; i < active_nr; i++) {
222 struct cache_entry *ce = active_cache[i];
223 if (ce_stage(ce))
28bea9e5
TC
224 output(o, 0, "%d %.*s", ce_stage(ce),
225 (int)ce_namelen(ce), ce->name);
9047ebbc
MV
226 }
227 return NULL;
228 }
229
230 if (!active_cache_tree)
231 active_cache_tree = cache_tree();
232
233 if (!cache_tree_fully_valid(active_cache_tree) &&
234 cache_tree_update(active_cache_tree,
235 active_cache, active_nr, 0, 0) < 0)
236 die("error building trees");
237
238 result = lookup_tree(active_cache_tree->sha1);
239
240 return result;
241}
242
243static int save_files_dirs(const unsigned char *sha1,
244 const char *base, int baselen, const char *path,
245 unsigned int mode, int stage, void *context)
246{
247 int len = strlen(path);
248 char *newpath = xmalloc(baselen + len + 1);
696ee23c
MV
249 struct merge_options *o = context;
250
9047ebbc
MV
251 memcpy(newpath, base, baselen);
252 memcpy(newpath + baselen, path, len);
253 newpath[baselen + len] = '\0';
254
255 if (S_ISDIR(mode))
696ee23c 256 string_list_insert(newpath, &o->current_directory_set);
9047ebbc 257 else
696ee23c 258 string_list_insert(newpath, &o->current_file_set);
9047ebbc
MV
259 free(newpath);
260
d3bee161 261 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
262}
263
696ee23c 264static int get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc
MV
265{
266 int n;
696ee23c 267 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
9047ebbc 268 return 0;
696ee23c 269 n = o->current_file_set.nr + o->current_directory_set.nr;
9047ebbc
MV
270 return n;
271}
272
273/*
274 * Returns an index_entry instance which doesn't have to correspond to
275 * a real cache entry in Git's index.
276 */
277static struct stage_data *insert_stage_data(const char *path,
278 struct tree *o, struct tree *a, struct tree *b,
279 struct string_list *entries)
280{
281 struct string_list_item *item;
282 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
283 get_tree_entry(o->object.sha1, path,
284 e->stages[1].sha, &e->stages[1].mode);
285 get_tree_entry(a->object.sha1, path,
286 e->stages[2].sha, &e->stages[2].mode);
287 get_tree_entry(b->object.sha1, path,
288 e->stages[3].sha, &e->stages[3].mode);
289 item = string_list_insert(path, entries);
290 item->util = e;
291 return e;
292}
293
294/*
295 * Create a dictionary mapping file names to stage_data objects. The
296 * dictionary contains one entry for every path with a non-zero stage entry.
297 */
298static struct string_list *get_unmerged(void)
299{
300 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
301 int i;
302
303 unmerged->strdup_strings = 1;
304
305 for (i = 0; i < active_nr; i++) {
306 struct string_list_item *item;
307 struct stage_data *e;
308 struct cache_entry *ce = active_cache[i];
309 if (!ce_stage(ce))
310 continue;
311
312 item = string_list_lookup(ce->name, unmerged);
313 if (!item) {
314 item = string_list_insert(ce->name, unmerged);
315 item->util = xcalloc(1, sizeof(struct stage_data));
316 }
317 e = item->util;
318 e->stages[ce_stage(ce)].mode = ce->ce_mode;
319 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
320 }
321
322 return unmerged;
323}
324
325struct rename
326{
327 struct diff_filepair *pair;
328 struct stage_data *src_entry;
329 struct stage_data *dst_entry;
330 unsigned processed:1;
331};
332
333/*
334 * Get information of all renames which occurred between 'o_tree' and
335 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
336 * 'b_tree') to be able to associate the correct cache entries with
337 * the rename information. 'tree' is always equal to either a_tree or b_tree.
338 */
8a2fce18
MV
339static struct string_list *get_renames(struct merge_options *o,
340 struct tree *tree,
341 struct tree *o_tree,
342 struct tree *a_tree,
343 struct tree *b_tree,
344 struct string_list *entries)
9047ebbc
MV
345{
346 int i;
347 struct string_list *renames;
348 struct diff_options opts;
349
350 renames = xcalloc(1, sizeof(struct string_list));
351 diff_setup(&opts);
352 DIFF_OPT_SET(&opts, RECURSIVE);
353 opts.detect_rename = DIFF_DETECT_RENAME;
8a2fce18
MV
354 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
355 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
9047ebbc
MV
356 500;
357 opts.warn_on_too_large_rename = 1;
358 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
359 if (diff_setup_done(&opts) < 0)
360 die("diff setup failed");
361 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
362 diffcore_std(&opts);
363 for (i = 0; i < diff_queued_diff.nr; ++i) {
364 struct string_list_item *item;
365 struct rename *re;
366 struct diff_filepair *pair = diff_queued_diff.queue[i];
367 if (pair->status != 'R') {
368 diff_free_filepair(pair);
369 continue;
370 }
371 re = xmalloc(sizeof(*re));
372 re->processed = 0;
373 re->pair = pair;
374 item = string_list_lookup(re->pair->one->path, entries);
375 if (!item)
376 re->src_entry = insert_stage_data(re->pair->one->path,
377 o_tree, a_tree, b_tree, entries);
378 else
379 re->src_entry = item->util;
380
381 item = string_list_lookup(re->pair->two->path, entries);
382 if (!item)
383 re->dst_entry = insert_stage_data(re->pair->two->path,
384 o_tree, a_tree, b_tree, entries);
385 else
386 re->dst_entry = item->util;
387 item = string_list_insert(pair->one->path, renames);
388 item->util = re;
389 }
390 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
391 diff_queued_diff.nr = 0;
392 diff_flush(&opts);
393 return renames;
394}
395
396static int update_stages(const char *path, struct diff_filespec *o,
397 struct diff_filespec *a, struct diff_filespec *b,
398 int clear)
399{
400 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
401 if (clear)
402 if (remove_file_from_cache(path))
403 return -1;
404 if (o)
405 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
406 return -1;
407 if (a)
408 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
409 return -1;
410 if (b)
411 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
412 return -1;
413 return 0;
414}
415
b7fa51da
MV
416static int remove_file(struct merge_options *o, int clean,
417 const char *path, int no_wd)
9047ebbc 418{
b7fa51da
MV
419 int update_cache = o->call_depth || clean;
420 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
421
422 if (update_cache) {
423 if (remove_file_from_cache(path))
424 return -1;
425 }
426 if (update_working_directory) {
15dc66ab 427 if (remove_path(path) && errno != ENOENT)
9047ebbc 428 return -1;
9047ebbc
MV
429 }
430 return 0;
431}
432
696ee23c 433static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc
MV
434{
435 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
436 int suffix = 0;
437 struct stat st;
438 char *p = newpath + strlen(path);
439 strcpy(newpath, path);
440 *(p++) = '~';
441 strcpy(p, branch);
442 for (; *p; ++p)
443 if ('/' == *p)
444 *p = '_';
696ee23c
MV
445 while (string_list_has_string(&o->current_file_set, newpath) ||
446 string_list_has_string(&o->current_directory_set, newpath) ||
9047ebbc
MV
447 lstat(newpath, &st) == 0)
448 sprintf(p, "_%d", suffix++);
449
696ee23c 450 string_list_insert(newpath, &o->current_file_set);
9047ebbc
MV
451 return newpath;
452}
453
454static void flush_buffer(int fd, const char *buf, unsigned long size)
455{
456 while (size > 0) {
457 long ret = write_in_full(fd, buf, size);
458 if (ret < 0) {
459 /* Ignore epipe */
460 if (errno == EPIPE)
461 break;
d824cbba 462 die_errno("merge-recursive");
9047ebbc
MV
463 } else if (!ret) {
464 die("merge-recursive: disk full?");
465 }
466 size -= ret;
467 buf += ret;
468 }
469}
470
60c91181
JH
471static int would_lose_untracked(const char *path)
472{
473 int pos = cache_name_pos(path, strlen(path));
474
475 if (pos < 0)
476 pos = -1 - pos;
477 while (pos < active_nr &&
478 !strcmp(path, active_cache[pos]->name)) {
479 /*
480 * If stage #0, it is definitely tracked.
481 * If it has stage #2 then it was tracked
482 * before this merge started. All other
483 * cases the path was not tracked.
484 */
485 switch (ce_stage(active_cache[pos])) {
486 case 0:
487 case 2:
488 return 0;
489 }
490 pos++;
491 }
492 return file_exists(path);
493}
494
9047ebbc
MV
495static int make_room_for_path(const char *path)
496{
497 int status;
498 const char *msg = "failed to create path '%s'%s";
499
500 status = safe_create_leading_directories_const(path);
501 if (status) {
502 if (status == -3) {
503 /* something else exists */
504 error(msg, path, ": perhaps a D/F conflict?");
505 return -1;
506 }
507 die(msg, path, "");
508 }
509
60c91181
JH
510 /*
511 * Do not unlink a file in the work tree if we are not
512 * tracking it.
513 */
514 if (would_lose_untracked(path))
515 return error("refusing to lose untracked file at '%s'",
516 path);
517
9047ebbc
MV
518 /* Successful unlink is good.. */
519 if (!unlink(path))
520 return 0;
521 /* .. and so is no existing file */
522 if (errno == ENOENT)
523 return 0;
524 /* .. but not some other error (who really cares what?) */
525 return error(msg, path, ": perhaps a D/F conflict?");
526}
527
b7fa51da
MV
528static void update_file_flags(struct merge_options *o,
529 const unsigned char *sha,
9047ebbc
MV
530 unsigned mode,
531 const char *path,
532 int update_cache,
533 int update_wd)
534{
b7fa51da 535 if (o->call_depth)
9047ebbc
MV
536 update_wd = 0;
537
538 if (update_wd) {
539 enum object_type type;
540 void *buf;
541 unsigned long size;
542
543 if (S_ISGITLINK(mode))
0c44c943
JH
544 /*
545 * We may later decide to recursively descend into
546 * the submodule directory and update its index
547 * and/or work tree, but we do not do that now.
548 */
549 goto update_index;
9047ebbc
MV
550
551 buf = read_sha1_file(sha, &type, &size);
552 if (!buf)
553 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
554 if (type != OBJ_BLOB)
555 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
556 if (S_ISREG(mode)) {
f285a2d7 557 struct strbuf strbuf = STRBUF_INIT;
9047ebbc
MV
558 if (convert_to_working_tree(path, buf, size, &strbuf)) {
559 free(buf);
560 size = strbuf.len;
561 buf = strbuf_detach(&strbuf, NULL);
562 }
563 }
564
565 if (make_room_for_path(path) < 0) {
566 update_wd = 0;
567 free(buf);
568 goto update_index;
569 }
570 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
571 int fd;
572 if (mode & 0100)
573 mode = 0777;
574 else
575 mode = 0666;
576 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
577 if (fd < 0)
d824cbba 578 die_errno("failed to open '%s'", path);
9047ebbc
MV
579 flush_buffer(fd, buf, size);
580 close(fd);
581 } else if (S_ISLNK(mode)) {
582 char *lnk = xmemdupz(buf, size);
583 safe_create_leading_directories_const(path);
584 unlink(path);
304dcf26 585 if (symlink(lnk, path))
d824cbba 586 die_errno("failed to symlink '%s'", path);
9047ebbc
MV
587 free(lnk);
588 } else
589 die("do not know what to do with %06o %s '%s'",
590 mode, sha1_to_hex(sha), path);
591 free(buf);
592 }
593 update_index:
594 if (update_cache)
595 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
596}
597
b7fa51da
MV
598static void update_file(struct merge_options *o,
599 int clean,
9047ebbc
MV
600 const unsigned char *sha,
601 unsigned mode,
602 const char *path)
603{
b7fa51da 604 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
605}
606
607/* Low level file merging, update and removal */
608
609struct merge_file_info
610{
611 unsigned char sha[20];
612 unsigned mode;
613 unsigned clean:1,
614 merge:1;
615};
616
617static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
618{
619 unsigned long size;
620 enum object_type type;
621
622 if (!hashcmp(sha1, null_sha1)) {
623 mm->ptr = xstrdup("");
624 mm->size = 0;
625 return;
626 }
627
628 mm->ptr = read_sha1_file(sha1, &type, &size);
629 if (!mm->ptr || type != OBJ_BLOB)
630 die("unable to read blob object %s", sha1_to_hex(sha1));
631 mm->size = size;
632}
633
b7fa51da
MV
634static int merge_3way(struct merge_options *o,
635 mmbuffer_t *result_buf,
636 struct diff_filespec *one,
9047ebbc
MV
637 struct diff_filespec *a,
638 struct diff_filespec *b,
639 const char *branch1,
640 const char *branch2)
641{
642 mmfile_t orig, src1, src2;
643 char *name1, *name2;
644 int merge_status;
8cc5b290
AP
645 int favor;
646
647 if (o->call_depth)
648 favor = 0;
649 else {
650 switch (o->recursive_variant) {
651 case MERGE_RECURSIVE_OURS:
652 favor = XDL_MERGE_FAVOR_OURS;
653 break;
654 case MERGE_RECURSIVE_THEIRS:
655 favor = XDL_MERGE_FAVOR_THEIRS;
656 break;
657 default:
658 favor = 0;
659 break;
660 }
661 }
9047ebbc 662
606475f3
MR
663 if (strcmp(a->path, b->path)) {
664 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
665 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
666 } else {
667 name1 = xstrdup(mkpath("%s", branch1));
668 name2 = xstrdup(mkpath("%s", branch2));
669 }
9047ebbc 670
b7fa51da 671 fill_mm(one->sha1, &orig);
9047ebbc
MV
672 fill_mm(a->sha1, &src1);
673 fill_mm(b->sha1, &src2);
674
675 merge_status = ll_merge(result_buf, a->path, &orig,
676 &src1, name1, &src2, name2,
8cc5b290 677 (!!o->call_depth) | (favor << 1));
9047ebbc
MV
678
679 free(name1);
680 free(name2);
681 free(orig.ptr);
682 free(src1.ptr);
683 free(src2.ptr);
684 return merge_status;
685}
686
b7fa51da
MV
687static struct merge_file_info merge_file(struct merge_options *o,
688 struct diff_filespec *one,
689 struct diff_filespec *a,
690 struct diff_filespec *b,
691 const char *branch1,
692 const char *branch2)
9047ebbc
MV
693{
694 struct merge_file_info result;
695 result.merge = 0;
696 result.clean = 1;
697
698 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
699 result.clean = 0;
700 if (S_ISREG(a->mode)) {
701 result.mode = a->mode;
702 hashcpy(result.sha, a->sha1);
703 } else {
704 result.mode = b->mode;
705 hashcpy(result.sha, b->sha1);
706 }
707 } else {
b7fa51da 708 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
9047ebbc
MV
709 result.merge = 1;
710
711 /*
712 * Merge modes
713 */
b7fa51da 714 if (a->mode == b->mode || a->mode == one->mode)
9047ebbc
MV
715 result.mode = b->mode;
716 else {
717 result.mode = a->mode;
b7fa51da 718 if (b->mode != one->mode) {
9047ebbc
MV
719 result.clean = 0;
720 result.merge = 1;
721 }
722 }
723
b7fa51da 724 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
9047ebbc 725 hashcpy(result.sha, b->sha1);
b7fa51da 726 else if (sha_eq(b->sha1, one->sha1))
9047ebbc
MV
727 hashcpy(result.sha, a->sha1);
728 else if (S_ISREG(a->mode)) {
729 mmbuffer_t result_buf;
730 int merge_status;
731
b7fa51da 732 merge_status = merge_3way(o, &result_buf, one, a, b,
9047ebbc
MV
733 branch1, branch2);
734
735 if ((merge_status < 0) || !result_buf.ptr)
736 die("Failed to execute internal merge");
737
738 if (write_sha1_file(result_buf.ptr, result_buf.size,
739 blob_type, result.sha))
740 die("Unable to add %s to database",
741 a->path);
742
743 free(result_buf.ptr);
744 result.clean = (merge_status == 0);
745 } else if (S_ISGITLINK(a->mode)) {
746 result.clean = 0;
747 hashcpy(result.sha, a->sha1);
748 } else if (S_ISLNK(a->mode)) {
749 hashcpy(result.sha, a->sha1);
750
751 if (!sha_eq(a->sha1, b->sha1))
752 result.clean = 0;
753 } else {
754 die("unsupported object type in the tree");
755 }
756 }
757
758 return result;
759}
760
8a2fce18
MV
761static void conflict_rename_rename(struct merge_options *o,
762 struct rename *ren1,
9047ebbc
MV
763 const char *branch1,
764 struct rename *ren2,
765 const char *branch2)
766{
767 char *del[2];
768 int delp = 0;
769 const char *ren1_dst = ren1->pair->two->path;
770 const char *ren2_dst = ren2->pair->two->path;
771 const char *dst_name1 = ren1_dst;
772 const char *dst_name2 = ren2_dst;
696ee23c
MV
773 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
774 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
8a2fce18 775 output(o, 1, "%s is a directory in %s adding as %s instead",
9047ebbc 776 ren1_dst, branch2, dst_name1);
b7fa51da 777 remove_file(o, 0, ren1_dst, 0);
9047ebbc 778 }
696ee23c
MV
779 if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
780 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
8a2fce18 781 output(o, 1, "%s is a directory in %s adding as %s instead",
9047ebbc 782 ren2_dst, branch1, dst_name2);
b7fa51da 783 remove_file(o, 0, ren2_dst, 0);
9047ebbc 784 }
b7fa51da 785 if (o->call_depth) {
9047ebbc
MV
786 remove_file_from_cache(dst_name1);
787 remove_file_from_cache(dst_name2);
788 /*
789 * Uncomment to leave the conflicting names in the resulting tree
790 *
b7fa51da
MV
791 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
792 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
9047ebbc
MV
793 */
794 } else {
795 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
796 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
797 }
798 while (delp--)
799 free(del[delp]);
800}
801
8a2fce18
MV
802static void conflict_rename_dir(struct merge_options *o,
803 struct rename *ren1,
9047ebbc
MV
804 const char *branch1)
805{
696ee23c 806 char *new_path = unique_path(o, ren1->pair->two->path, branch1);
8a2fce18 807 output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
b7fa51da
MV
808 remove_file(o, 0, ren1->pair->two->path, 0);
809 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
9047ebbc
MV
810 free(new_path);
811}
812
8a2fce18
MV
813static void conflict_rename_rename_2(struct merge_options *o,
814 struct rename *ren1,
9047ebbc
MV
815 const char *branch1,
816 struct rename *ren2,
817 const char *branch2)
818{
696ee23c
MV
819 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
820 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
8a2fce18 821 output(o, 1, "Renaming %s to %s and %s to %s instead",
9047ebbc
MV
822 ren1->pair->one->path, new_path1,
823 ren2->pair->one->path, new_path2);
b7fa51da
MV
824 remove_file(o, 0, ren1->pair->two->path, 0);
825 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
826 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
9047ebbc
MV
827 free(new_path2);
828 free(new_path1);
829}
830
8a2fce18
MV
831static int process_renames(struct merge_options *o,
832 struct string_list *a_renames,
833 struct string_list *b_renames)
9047ebbc
MV
834{
835 int clean_merge = 1, i, j;
836 struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
837 const struct rename *sre;
838
839 for (i = 0; i < a_renames->nr; i++) {
840 sre = a_renames->items[i].util;
841 string_list_insert(sre->pair->two->path, &a_by_dst)->util
842 = sre->dst_entry;
843 }
844 for (i = 0; i < b_renames->nr; i++) {
845 sre = b_renames->items[i].util;
846 string_list_insert(sre->pair->two->path, &b_by_dst)->util
847 = sre->dst_entry;
848 }
849
850 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
9047ebbc 851 char *src;
8e24cbae 852 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
853 struct rename *ren1 = NULL, *ren2 = NULL;
854 const char *branch1, *branch2;
855 const char *ren1_src, *ren1_dst;
856
857 if (i >= a_renames->nr) {
9047ebbc
MV
858 ren2 = b_renames->items[j++].util;
859 } else if (j >= b_renames->nr) {
9047ebbc
MV
860 ren1 = a_renames->items[i++].util;
861 } else {
8e24cbae
BK
862 int compare = strcmp(a_renames->items[i].string,
863 b_renames->items[j].string);
9047ebbc
MV
864 if (compare <= 0)
865 ren1 = a_renames->items[i++].util;
866 if (compare >= 0)
867 ren2 = b_renames->items[j++].util;
868 }
869
870 /* TODO: refactor, so that 1/2 are not needed */
871 if (ren1) {
872 renames1 = a_renames;
9047ebbc 873 renames2Dst = &b_by_dst;
8a2fce18
MV
874 branch1 = o->branch1;
875 branch2 = o->branch2;
9047ebbc
MV
876 } else {
877 struct rename *tmp;
878 renames1 = b_renames;
9047ebbc 879 renames2Dst = &a_by_dst;
8a2fce18
MV
880 branch1 = o->branch2;
881 branch2 = o->branch1;
9047ebbc
MV
882 tmp = ren2;
883 ren2 = ren1;
884 ren1 = tmp;
885 }
886 src = ren1->pair->one->path;
887
888 ren1->dst_entry->processed = 1;
889 ren1->src_entry->processed = 1;
890
891 if (ren1->processed)
892 continue;
893 ren1->processed = 1;
894
895 ren1_src = ren1->pair->one->path;
896 ren1_dst = ren1->pair->two->path;
897
898 if (ren2) {
899 const char *ren2_src = ren2->pair->one->path;
900 const char *ren2_dst = ren2->pair->two->path;
901 /* Renamed in 1 and renamed in 2 */
902 if (strcmp(ren1_src, ren2_src) != 0)
903 die("ren1.src != ren2.src");
904 ren2->dst_entry->processed = 1;
905 ren2->processed = 1;
906 if (strcmp(ren1_dst, ren2_dst) != 0) {
907 clean_merge = 0;
8a2fce18 908 output(o, 1, "CONFLICT (rename/rename): "
9047ebbc
MV
909 "Rename \"%s\"->\"%s\" in branch \"%s\" "
910 "rename \"%s\"->\"%s\" in \"%s\"%s",
911 src, ren1_dst, branch1,
912 src, ren2_dst, branch2,
b7fa51da
MV
913 o->call_depth ? " (left unresolved)": "");
914 if (o->call_depth) {
9047ebbc 915 remove_file_from_cache(src);
b7fa51da 916 update_file(o, 0, ren1->pair->one->sha1,
9047ebbc
MV
917 ren1->pair->one->mode, src);
918 }
8a2fce18 919 conflict_rename_rename(o, ren1, branch1, ren2, branch2);
9047ebbc
MV
920 } else {
921 struct merge_file_info mfi;
b7fa51da
MV
922 remove_file(o, 1, ren1_src, 1);
923 mfi = merge_file(o,
924 ren1->pair->one,
9047ebbc
MV
925 ren1->pair->two,
926 ren2->pair->two,
927 branch1,
928 branch2);
929 if (mfi.merge || !mfi.clean)
8a2fce18 930 output(o, 1, "Renaming %s->%s", src, ren1_dst);
9047ebbc
MV
931
932 if (mfi.merge)
8a2fce18 933 output(o, 2, "Auto-merging %s", ren1_dst);
9047ebbc
MV
934
935 if (!mfi.clean) {
8a2fce18 936 output(o, 1, "CONFLICT (content): merge conflict in %s",
9047ebbc
MV
937 ren1_dst);
938 clean_merge = 0;
939
b7fa51da 940 if (!o->call_depth)
9047ebbc
MV
941 update_stages(ren1_dst,
942 ren1->pair->one,
943 ren1->pair->two,
944 ren2->pair->two,
945 1 /* clear */);
946 }
b7fa51da 947 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
9047ebbc
MV
948 }
949 } else {
950 /* Renamed in 1, maybe changed in 2 */
951 struct string_list_item *item;
952 /* we only use sha1 and mode of these */
953 struct diff_filespec src_other, dst_other;
954 int try_merge, stage = a_renames == renames1 ? 3: 2;
955
b7fa51da 956 remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
9047ebbc
MV
957
958 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
959 src_other.mode = ren1->src_entry->stages[stage].mode;
960 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
961 dst_other.mode = ren1->dst_entry->stages[stage].mode;
962
963 try_merge = 0;
964
696ee23c 965 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
9047ebbc 966 clean_merge = 0;
8a2fce18 967 output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
9047ebbc
MV
968 " directory %s added in %s",
969 ren1_src, ren1_dst, branch1,
970 ren1_dst, branch2);
8a2fce18 971 conflict_rename_dir(o, ren1, branch1);
9047ebbc
MV
972 } else if (sha_eq(src_other.sha1, null_sha1)) {
973 clean_merge = 0;
8a2fce18 974 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
9047ebbc
MV
975 "and deleted in %s",
976 ren1_src, ren1_dst, branch1,
977 branch2);
b7fa51da 978 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
bf74106a
DO
979 if (!o->call_depth)
980 update_stages(ren1_dst, NULL,
981 branch1 == o->branch1 ?
982 ren1->pair->two : NULL,
983 branch1 == o->branch1 ?
984 NULL : ren1->pair->two, 1);
9047ebbc
MV
985 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
986 const char *new_path;
987 clean_merge = 0;
988 try_merge = 1;
8a2fce18 989 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
9047ebbc
MV
990 "%s added in %s",
991 ren1_src, ren1_dst, branch1,
992 ren1_dst, branch2);
c94736a2
JH
993 if (o->call_depth) {
994 struct merge_file_info mfi;
995 struct diff_filespec one, a, b;
996
997 one.path = a.path = b.path =
998 (char *)ren1_dst;
999 hashcpy(one.sha1, null_sha1);
1000 one.mode = 0;
1001 hashcpy(a.sha1, ren1->pair->two->sha1);
1002 a.mode = ren1->pair->two->mode;
1003 hashcpy(b.sha1, dst_other.sha1);
1004 b.mode = dst_other.mode;
1005 mfi = merge_file(o, &one, &a, &b,
1006 branch1,
1007 branch2);
1008 output(o, 1, "Adding merged %s", ren1_dst);
1009 update_file(o, 0,
1010 mfi.sha,
1011 mfi.mode,
1012 ren1_dst);
1013 } else {
1014 new_path = unique_path(o, ren1_dst, branch2);
1015 output(o, 1, "Adding as %s instead", new_path);
1016 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1017 }
9047ebbc
MV
1018 } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
1019 ren2 = item->util;
1020 clean_merge = 0;
1021 ren2->processed = 1;
8a2fce18
MV
1022 output(o, 1, "CONFLICT (rename/rename): "
1023 "Rename %s->%s in %s. "
9047ebbc
MV
1024 "Rename %s->%s in %s",
1025 ren1_src, ren1_dst, branch1,
1026 ren2->pair->one->path, ren2->pair->two->path, branch2);
8a2fce18 1027 conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
9047ebbc
MV
1028 } else
1029 try_merge = 1;
1030
1031 if (try_merge) {
8a2fce18 1032 struct diff_filespec *one, *a, *b;
9047ebbc
MV
1033 struct merge_file_info mfi;
1034 src_other.path = (char *)ren1_src;
1035
8a2fce18 1036 one = ren1->pair->one;
9047ebbc
MV
1037 if (a_renames == renames1) {
1038 a = ren1->pair->two;
1039 b = &src_other;
1040 } else {
1041 b = ren1->pair->two;
1042 a = &src_other;
1043 }
b7fa51da 1044 mfi = merge_file(o, one, a, b,
8a2fce18 1045 o->branch1, o->branch2);
9047ebbc
MV
1046
1047 if (mfi.clean &&
1048 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
1049 mfi.mode == ren1->pair->two->mode)
1050 /*
1051 * This messaged is part of
1052 * t6022 test. If you change
1053 * it update the test too.
1054 */
8a2fce18 1055 output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
9047ebbc
MV
1056 else {
1057 if (mfi.merge || !mfi.clean)
8a2fce18 1058 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
9047ebbc 1059 if (mfi.merge)
8a2fce18 1060 output(o, 2, "Auto-merging %s", ren1_dst);
9047ebbc 1061 if (!mfi.clean) {
8a2fce18 1062 output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
9047ebbc
MV
1063 ren1_dst);
1064 clean_merge = 0;
1065
b7fa51da 1066 if (!o->call_depth)
9047ebbc 1067 update_stages(ren1_dst,
8a2fce18 1068 one, a, b, 1);
9047ebbc 1069 }
b7fa51da 1070 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
9047ebbc
MV
1071 }
1072 }
1073 }
1074 }
1075 string_list_clear(&a_by_dst, 0);
1076 string_list_clear(&b_by_dst, 0);
1077
1078 return clean_merge;
1079}
1080
1081static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1082{
1083 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1084}
1085
1086/* Per entry merge function */
8a2fce18
MV
1087static int process_entry(struct merge_options *o,
1088 const char *path, struct stage_data *entry)
9047ebbc
MV
1089{
1090 /*
1091 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1092 print_index_entry("\tpath: ", entry);
1093 */
1094 int clean_merge = 1;
1095 unsigned o_mode = entry->stages[1].mode;
1096 unsigned a_mode = entry->stages[2].mode;
1097 unsigned b_mode = entry->stages[3].mode;
1098 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1099 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1100 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1101
1102 if (o_sha && (!a_sha || !b_sha)) {
1103 /* Case A: Deleted in one */
1104 if ((!a_sha && !b_sha) ||
1105 (sha_eq(a_sha, o_sha) && !b_sha) ||
1106 (!a_sha && sha_eq(b_sha, o_sha))) {
1107 /* Deleted in both or deleted in one and
1108 * unchanged in the other */
1109 if (a_sha)
8a2fce18 1110 output(o, 2, "Removing %s", path);
9047ebbc 1111 /* do not touch working file if it did not exist */
b7fa51da 1112 remove_file(o, 1, path, !a_sha);
9047ebbc
MV
1113 } else {
1114 /* Deleted in one and changed in the other */
1115 clean_merge = 0;
1116 if (!a_sha) {
8a2fce18 1117 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
9047ebbc 1118 "and modified in %s. Version %s of %s left in tree.",
8a2fce18
MV
1119 path, o->branch1,
1120 o->branch2, o->branch2, path);
b7fa51da 1121 update_file(o, 0, b_sha, b_mode, path);
9047ebbc 1122 } else {
8a2fce18 1123 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
9047ebbc 1124 "and modified in %s. Version %s of %s left in tree.",
8a2fce18
MV
1125 path, o->branch2,
1126 o->branch1, o->branch1, path);
b7fa51da 1127 update_file(o, 0, a_sha, a_mode, path);
9047ebbc
MV
1128 }
1129 }
1130
1131 } else if ((!o_sha && a_sha && !b_sha) ||
1132 (!o_sha && !a_sha && b_sha)) {
1133 /* Case B: Added in one. */
1134 const char *add_branch;
1135 const char *other_branch;
1136 unsigned mode;
1137 const unsigned char *sha;
1138 const char *conf;
1139
1140 if (a_sha) {
8a2fce18
MV
1141 add_branch = o->branch1;
1142 other_branch = o->branch2;
9047ebbc
MV
1143 mode = a_mode;
1144 sha = a_sha;
1145 conf = "file/directory";
1146 } else {
8a2fce18
MV
1147 add_branch = o->branch2;
1148 other_branch = o->branch1;
9047ebbc
MV
1149 mode = b_mode;
1150 sha = b_sha;
1151 conf = "directory/file";
1152 }
696ee23c
MV
1153 if (string_list_has_string(&o->current_directory_set, path)) {
1154 const char *new_path = unique_path(o, path, add_branch);
9047ebbc 1155 clean_merge = 0;
8a2fce18 1156 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
9047ebbc
MV
1157 "Adding %s as %s",
1158 conf, path, other_branch, path, new_path);
b7fa51da
MV
1159 remove_file(o, 0, path, 0);
1160 update_file(o, 0, sha, mode, new_path);
9047ebbc 1161 } else {
8a2fce18 1162 output(o, 2, "Adding %s", path);
b7fa51da 1163 update_file(o, 1, sha, mode, path);
9047ebbc
MV
1164 }
1165 } else if (a_sha && b_sha) {
1166 /* Case C: Added in both (check for same permissions) and */
1167 /* case D: Modified in both, but differently. */
1168 const char *reason = "content";
1169 struct merge_file_info mfi;
8a2fce18 1170 struct diff_filespec one, a, b;
9047ebbc
MV
1171
1172 if (!o_sha) {
1173 reason = "add/add";
1174 o_sha = (unsigned char *)null_sha1;
1175 }
8a2fce18
MV
1176 output(o, 2, "Auto-merging %s", path);
1177 one.path = a.path = b.path = (char *)path;
1178 hashcpy(one.sha1, o_sha);
1179 one.mode = o_mode;
9047ebbc
MV
1180 hashcpy(a.sha1, a_sha);
1181 a.mode = a_mode;
1182 hashcpy(b.sha1, b_sha);
1183 b.mode = b_mode;
1184
b7fa51da 1185 mfi = merge_file(o, &one, &a, &b,
8a2fce18 1186 o->branch1, o->branch2);
9047ebbc
MV
1187
1188 clean_merge = mfi.clean;
39d8e271
CB
1189 if (!mfi.clean) {
1190 if (S_ISGITLINK(mfi.mode))
1191 reason = "submodule";
8a2fce18 1192 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
9047ebbc 1193 reason, path);
9047ebbc 1194 }
39d8e271 1195 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
9047ebbc
MV
1196 } else if (!o_sha && !a_sha && !b_sha) {
1197 /*
1198 * this entry was deleted altogether. a_mode == 0 means
1199 * we had that path and want to actively remove it.
1200 */
b7fa51da 1201 remove_file(o, 1, path, !a_mode);
9047ebbc
MV
1202 } else
1203 die("Fatal merge failure, shouldn't happen.");
1204
1205 return clean_merge;
1206}
1207
8a2fce18
MV
1208int merge_trees(struct merge_options *o,
1209 struct tree *head,
9047ebbc
MV
1210 struct tree *merge,
1211 struct tree *common,
9047ebbc
MV
1212 struct tree **result)
1213{
1214 int code, clean;
1215
8cc5b290 1216 if (o->recursive_variant == MERGE_RECURSIVE_SUBTREE) {
9047ebbc
MV
1217 merge = shift_tree_object(head, merge);
1218 common = shift_tree_object(head, common);
1219 }
1220
1221 if (sha_eq(common->object.sha1, merge->object.sha1)) {
8a2fce18 1222 output(o, 0, "Already uptodate!");
9047ebbc
MV
1223 *result = head;
1224 return 1;
1225 }
1226
b7fa51da 1227 code = git_merge_trees(o->call_depth, common, head, merge);
9047ebbc 1228
fadd069d
JH
1229 if (code != 0) {
1230 if (show(o, 4) || o->call_depth)
1231 die("merging of trees %s and %s failed",
1232 sha1_to_hex(head->object.sha1),
1233 sha1_to_hex(merge->object.sha1));
1234 else
1235 exit(128);
1236 }
9047ebbc
MV
1237
1238 if (unmerged_cache()) {
1239 struct string_list *entries, *re_head, *re_merge;
1240 int i;
696ee23c
MV
1241 string_list_clear(&o->current_file_set, 1);
1242 string_list_clear(&o->current_directory_set, 1);
1243 get_files_dirs(o, head);
1244 get_files_dirs(o, merge);
9047ebbc
MV
1245
1246 entries = get_unmerged();
8a2fce18
MV
1247 re_head = get_renames(o, head, common, head, merge, entries);
1248 re_merge = get_renames(o, merge, common, head, merge, entries);
1249 clean = process_renames(o, re_head, re_merge);
9047ebbc
MV
1250 for (i = 0; i < entries->nr; i++) {
1251 const char *path = entries->items[i].string;
1252 struct stage_data *e = entries->items[i].util;
1253 if (!e->processed
8a2fce18 1254 && !process_entry(o, path, e))
9047ebbc
MV
1255 clean = 0;
1256 }
1257
1258 string_list_clear(re_merge, 0);
1259 string_list_clear(re_head, 0);
1260 string_list_clear(entries, 1);
1261
1262 }
1263 else
1264 clean = 1;
1265
b7fa51da 1266 if (o->call_depth)
8a2fce18 1267 *result = write_tree_from_memory(o);
9047ebbc
MV
1268
1269 return clean;
1270}
1271
1272static struct commit_list *reverse_commit_list(struct commit_list *list)
1273{
1274 struct commit_list *next = NULL, *current, *backup;
1275 for (current = list; current; current = backup) {
1276 backup = current->next;
1277 current->next = next;
1278 next = current;
1279 }
1280 return next;
1281}
1282
1283/*
1284 * Merge the commits h1 and h2, return the resulting virtual
1285 * commit object and a flag indicating the cleanness of the merge.
1286 */
8a2fce18
MV
1287int merge_recursive(struct merge_options *o,
1288 struct commit *h1,
9047ebbc 1289 struct commit *h2,
9047ebbc
MV
1290 struct commit_list *ca,
1291 struct commit **result)
1292{
1293 struct commit_list *iter;
1294 struct commit *merged_common_ancestors;
1295 struct tree *mrtree = mrtree;
1296 int clean;
1297
8a2fce18
MV
1298 if (show(o, 4)) {
1299 output(o, 4, "Merging:");
5033639c
MV
1300 output_commit_title(o, h1);
1301 output_commit_title(o, h2);
9047ebbc
MV
1302 }
1303
1304 if (!ca) {
1305 ca = get_merge_bases(h1, h2, 1);
1306 ca = reverse_commit_list(ca);
1307 }
1308
8a2fce18
MV
1309 if (show(o, 5)) {
1310 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
9047ebbc 1311 for (iter = ca; iter; iter = iter->next)
5033639c 1312 output_commit_title(o, iter->item);
9047ebbc
MV
1313 }
1314
1315 merged_common_ancestors = pop_commit(&ca);
1316 if (merged_common_ancestors == NULL) {
1317 /* if there is no common ancestor, make an empty tree */
1318 struct tree *tree = xcalloc(1, sizeof(struct tree));
1319
1320 tree->object.parsed = 1;
1321 tree->object.type = OBJ_TREE;
1322 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1323 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1324 }
1325
1326 for (iter = ca; iter; iter = iter->next) {
8a2fce18 1327 const char *saved_b1, *saved_b2;
5033639c 1328 o->call_depth++;
9047ebbc
MV
1329 /*
1330 * When the merge fails, the result contains files
1331 * with conflict markers. The cleanness flag is
1332 * ignored, it was never actually used, as result of
1333 * merge_trees has always overwritten it: the committed
1334 * "conflicts" were already resolved.
1335 */
1336 discard_cache();
8a2fce18
MV
1337 saved_b1 = o->branch1;
1338 saved_b2 = o->branch2;
1339 o->branch1 = "Temporary merge branch 1";
1340 o->branch2 = "Temporary merge branch 2";
1341 merge_recursive(o, merged_common_ancestors, iter->item,
1342 NULL, &merged_common_ancestors);
1343 o->branch1 = saved_b1;
1344 o->branch2 = saved_b2;
5033639c 1345 o->call_depth--;
9047ebbc
MV
1346
1347 if (!merged_common_ancestors)
1348 die("merge returned no commit");
1349 }
1350
1351 discard_cache();
b7fa51da 1352 if (!o->call_depth)
9047ebbc 1353 read_cache();
9047ebbc 1354
8a2fce18
MV
1355 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1356 &mrtree);
9047ebbc 1357
b7fa51da 1358 if (o->call_depth) {
9047ebbc
MV
1359 *result = make_virtual_commit(mrtree, "merged tree");
1360 commit_list_insert(h1, &(*result)->parents);
1361 commit_list_insert(h2, &(*result)->parents->next);
1362 }
c7d84924 1363 flush_output(o);
9047ebbc
MV
1364 return clean;
1365}
1366
73118f89
SB
1367static struct commit *get_ref(const unsigned char *sha1, const char *name)
1368{
1369 struct object *object;
1370
1371 object = deref_tag(parse_object(sha1), name, strlen(name));
1372 if (!object)
1373 return NULL;
1374 if (object->type == OBJ_TREE)
1375 return make_virtual_commit((struct tree*)object, name);
1376 if (object->type != OBJ_COMMIT)
1377 return NULL;
1378 if (parse_commit((struct commit *)object))
1379 return NULL;
1380 return (struct commit *)object;
1381}
1382
8a2fce18
MV
1383int merge_recursive_generic(struct merge_options *o,
1384 const unsigned char *head,
1385 const unsigned char *merge,
1386 int num_base_list,
1387 const unsigned char **base_list,
1388 struct commit **result)
73118f89
SB
1389{
1390 int clean, index_fd;
1391 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
8a2fce18
MV
1392 struct commit *head_commit = get_ref(head, o->branch1);
1393 struct commit *next_commit = get_ref(merge, o->branch2);
73118f89
SB
1394 struct commit_list *ca = NULL;
1395
1396 if (base_list) {
1397 int i;
8a2fce18 1398 for (i = 0; i < num_base_list; ++i) {
73118f89 1399 struct commit *base;
8a2fce18 1400 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
73118f89 1401 return error("Could not parse object '%s'",
8a2fce18 1402 sha1_to_hex(base_list[i]));
73118f89
SB
1403 commit_list_insert(base, &ca);
1404 }
1405 }
1406
1407 index_fd = hold_locked_index(lock, 1);
8a2fce18
MV
1408 clean = merge_recursive(o, head_commit, next_commit, ca,
1409 result);
73118f89
SB
1410 if (active_cache_changed &&
1411 (write_cache(index_fd, active_cache, active_nr) ||
1412 commit_locked_index(lock)))
1413 return error("Unable to write index.");
1414
1415 return clean ? 0 : 1;
1416}
1417
8a2fce18 1418static int merge_recursive_config(const char *var, const char *value, void *cb)
9047ebbc 1419{
8a2fce18 1420 struct merge_options *o = cb;
9047ebbc 1421 if (!strcasecmp(var, "merge.verbosity")) {
8a2fce18 1422 o->verbosity = git_config_int(var, value);
9047ebbc
MV
1423 return 0;
1424 }
1425 if (!strcasecmp(var, "diff.renamelimit")) {
8a2fce18 1426 o->diff_rename_limit = git_config_int(var, value);
9047ebbc
MV
1427 return 0;
1428 }
1429 if (!strcasecmp(var, "merge.renamelimit")) {
8a2fce18 1430 o->merge_rename_limit = git_config_int(var, value);
9047ebbc
MV
1431 return 0;
1432 }
e137a892 1433 return git_xmerge_config(var, value, cb);
9047ebbc
MV
1434}
1435
8a2fce18 1436void init_merge_options(struct merge_options *o)
9047ebbc 1437{
8a2fce18
MV
1438 memset(o, 0, sizeof(struct merge_options));
1439 o->verbosity = 2;
1440 o->buffer_output = 1;
1441 o->diff_rename_limit = -1;
1442 o->merge_rename_limit = -1;
1443 git_config(merge_recursive_config, o);
9047ebbc 1444 if (getenv("GIT_MERGE_VERBOSITY"))
8a2fce18 1445 o->verbosity =
9047ebbc 1446 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
8a2fce18
MV
1447 if (o->verbosity >= 5)
1448 o->buffer_output = 0;
c7d84924 1449 strbuf_init(&o->obuf, 0);
696ee23c
MV
1450 memset(&o->current_file_set, 0, sizeof(struct string_list));
1451 o->current_file_set.strdup_strings = 1;
1452 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1453 o->current_directory_set.strdup_strings = 1;
9047ebbc 1454}