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 */
6#include "advice.h"
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"
20#include "attr.h"
21#include "merge-recursive.h"
22#include "dir.h"
23#include "submodule.h"
24static const char rename_limit_advice[] =
26"inexact rename detection was skipped because there were too many\n"
27" files. You may want to set your merge.renamelimit variable to at least\n"
28" %d and retry this merge.";
29static struct tree *shift_tree_object(struct tree *one, struct tree *two,
31 const char *subtree_shift)
32{
33 unsigned char shifted[20];
34 if (!*subtree_shift) {
36 shift_tree(one->object.sha1, two->object.sha1, shifted, 0);
37 } else {
38 shift_tree_by(one->object.sha1, two->object.sha1, shifted,
39 subtree_shift);
40 }
41 if (!hashcmp(two->object.sha1, shifted))
42 return two;
43 return lookup_tree(shifted);
44}
45/*
47 * A virtual commit has (const char *)commit->util set to the name.
48 */
49static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
51{
52 struct commit *commit = xcalloc(1, sizeof(struct commit));
53 commit->tree = tree;
54 commit->util = (void*)comment;
55 /* avoid warnings */
56 commit->object.parsed = 1;
57 return commit;
58}
59/*
61 * Since we use get_tree_entry(), which does not put the read object into
62 * the object pool, we cannot rely on a == b.
63 */
64static int sha_eq(const unsigned char *a, const unsigned char *b)
65{
66 if (!a && !b)
67 return 2;
68 return a && b && hashcmp(a, b) == 0;
69}
70enum rename_type {
72 RENAME_NORMAL = 0,
73 RENAME_DELETE,
74 RENAME_ONE_FILE_TO_TWO
75};
76struct rename_df_conflict_info {
78 enum rename_type rename_type;
79 struct diff_filepair *pair1;
80 struct diff_filepair *pair2;
81 const char *branch1;
82 const char *branch2;
83 struct stage_data *dst_entry1;
84 struct stage_data *dst_entry2;
85};
86/*
88 * Since we want to write the index eventually, we cannot reuse the index
89 * for these (temporary) data.
90 */
91struct stage_data
92{
93 struct
94 {
95 unsigned mode;
96 unsigned char sha[20];
97 } stages[4];
98 struct rename_df_conflict_info *rename_df_conflict_info;
99 unsigned processed:1;
100};
101static inline void setup_rename_df_conflict_info(enum rename_type rename_type,
103 struct diff_filepair *pair1,
104 struct diff_filepair *pair2,
105 const char *branch1,
106 const char *branch2,
107 struct stage_data *dst_entry1,
108 struct stage_data *dst_entry2)
109{
110 struct rename_df_conflict_info *ci = xcalloc(1, sizeof(struct rename_df_conflict_info));
111 ci->rename_type = rename_type;
112 ci->pair1 = pair1;
113 ci->branch1 = branch1;
114 ci->branch2 = branch2;
115 ci->dst_entry1 = dst_entry1;
117 dst_entry1->rename_df_conflict_info = ci;
118 dst_entry1->processed = 0;
119 assert(!pair2 == !dst_entry2);
121 if (dst_entry2) {
122 ci->dst_entry2 = dst_entry2;
123 ci->pair2 = pair2;
124 dst_entry2->rename_df_conflict_info = ci;
125 dst_entry2->processed = 0;
126 }
127}
128static int show(struct merge_options *o, int v)
130{
131 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
132}
133static void flush_output(struct merge_options *o)
135{
136 if (o->obuf.len) {
137 fputs(o->obuf.buf, stdout);
138 strbuf_reset(&o->obuf);
139 }
140}
141__attribute__((format (printf, 3, 4)))
143static void output(struct merge_options *o, int v, const char *fmt, ...)
144{
145 int len;
146 va_list ap;
147 if (!show(o, v))
149 return;
150 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
152 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
153 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
154 va_start(ap, fmt);
156 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
157 va_end(ap);
158 if (len < 0)
160 len = 0;
161 if (len >= strbuf_avail(&o->obuf)) {
162 strbuf_grow(&o->obuf, len + 2);
163 va_start(ap, fmt);
164 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
165 va_end(ap);
166 if (len >= strbuf_avail(&o->obuf)) {
167 die("this should not happen, your snprintf is broken");
168 }
169 }
170 strbuf_setlen(&o->obuf, o->obuf.len + len);
171 strbuf_add(&o->obuf, "\n", 1);
172 if (!o->buffer_output)
173 flush_output(o);
174}
175static void output_commit_title(struct merge_options *o, struct commit *commit)
177{
178 int i;
179 flush_output(o);
180 for (i = o->call_depth; i--;)
181 fputs(" ", stdout);
182 if (commit->util)
183 printf("virtual %s\n", (char *)commit->util);
184 else {
185 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
186 if (parse_commit(commit) != 0)
187 printf("(bad commit)\n");
188 else {
189 const char *title;
190 int len = find_commit_subject(commit->buffer, &title);
191 if (len)
192 printf("%.*s\n", len, title);
193 }
194 }
195}
196static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
198 const char *path, int stage, int refresh, int options)
199{
200 struct cache_entry *ce;
201 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
202 if (!ce)
203 return error("addinfo_cache failed for path '%s'", path);
204 return add_cache_entry(ce, options);
205}
206static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
208{
209 parse_tree(tree);
210 init_tree_desc(desc, tree->buffer, tree->size);
211}
212static int git_merge_trees(int index_only,
214 struct tree *common,
215 struct tree *head,
216 struct tree *merge)
217{
218 int rc;
219 struct tree_desc t[3];
220 struct unpack_trees_options opts;
221 memset(&opts, 0, sizeof(opts));
223 if (index_only)
224 opts.index_only = 1;
225 else
226 opts.update = 1;
227 opts.merge = 1;
228 opts.head_idx = 2;
229 opts.fn = threeway_merge;
230 opts.src_index = &the_index;
231 opts.dst_index = &the_index;
232 setup_unpack_trees_porcelain(&opts, "merge");
233 init_tree_desc_from_tree(t+0, common);
235 init_tree_desc_from_tree(t+1, head);
236 init_tree_desc_from_tree(t+2, merge);
237 rc = unpack_trees(3, t, &opts);
239 cache_tree_free(&active_cache_tree);
240 return rc;
241}
242struct tree *write_tree_from_memory(struct merge_options *o)
244{
245 struct tree *result = NULL;
246 if (unmerged_cache()) {
248 int i;
249 fprintf(stderr, "BUG: There are unmerged index entries:\n");
250 for (i = 0; i < active_nr; i++) {
251 struct cache_entry *ce = active_cache[i];
252 if (ce_stage(ce))
253 fprintf(stderr, "BUG: %d %.*s", ce_stage(ce),
254 (int)ce_namelen(ce), ce->name);
255 }
256 die("Bug in merge-recursive.c");
257 }
258 if (!active_cache_tree)
260 active_cache_tree = cache_tree();
261 if (!cache_tree_fully_valid(active_cache_tree) &&
263 cache_tree_update(active_cache_tree,
264 active_cache, active_nr, 0, 0) < 0)
265 die("error building trees");
266 result = lookup_tree(active_cache_tree->sha1);
268 return result;
270}
271static int save_files_dirs(const unsigned char *sha1,
273 const char *base, int baselen, const char *path,
274 unsigned int mode, int stage, void *context)
275{
276 int len = strlen(path);
277 char *newpath = xmalloc(baselen + len + 1);
278 struct merge_options *o = context;
279 memcpy(newpath, base, baselen);
281 memcpy(newpath + baselen, path, len);
282 newpath[baselen + len] = '\0';
283 if (S_ISDIR(mode))
285 string_list_insert(&o->current_directory_set, newpath);
286 else
287 string_list_insert(&o->current_file_set, newpath);
288 free(newpath);
289 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
291}
292static int get_files_dirs(struct merge_options *o, struct tree *tree)
294{
295 int n;
296 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
297 return 0;
298 n = o->current_file_set.nr + o->current_directory_set.nr;
299 return n;
300}
301/*
303 * Returns an index_entry instance which doesn't have to correspond to
304 * a real cache entry in Git's index.
305 */
306static struct stage_data *insert_stage_data(const char *path,
307 struct tree *o, struct tree *a, struct tree *b,
308 struct string_list *entries)
309{
310 struct string_list_item *item;
311 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
312 get_tree_entry(o->object.sha1, path,
313 e->stages[1].sha, &e->stages[1].mode);
314 get_tree_entry(a->object.sha1, path,
315 e->stages[2].sha, &e->stages[2].mode);
316 get_tree_entry(b->object.sha1, path,
317 e->stages[3].sha, &e->stages[3].mode);
318 item = string_list_insert(entries, path);
319 item->util = e;
320 return e;
321}
322/*
324 * Create a dictionary mapping file names to stage_data objects. The
325 * dictionary contains one entry for every path with a non-zero stage entry.
326 */
327static struct string_list *get_unmerged(void)
328{
329 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
330 int i;
331 unmerged->strdup_strings = 1;
333 for (i = 0; i < active_nr; i++) {
335 struct string_list_item *item;
336 struct stage_data *e;
337 struct cache_entry *ce = active_cache[i];
338 if (!ce_stage(ce))
339 continue;
340 item = string_list_lookup(unmerged, ce->name);
342 if (!item) {
343 item = string_list_insert(unmerged, ce->name);
344 item->util = xcalloc(1, sizeof(struct stage_data));
345 }
346 e = item->util;
347 e->stages[ce_stage(ce)].mode = ce->ce_mode;
348 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
349 }
350 return unmerged;
352}
353static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
355 struct string_list *entries)
356{
357 /* If there are D/F conflicts, and the paths currently exist
358 * in the working copy as a file, we want to remove them to
359 * make room for the corresponding directory. Such paths will
360 * later be processed in process_df_entry() at the end. If
361 * the corresponding directory ends up being removed by the
362 * merge, then the file will be reinstated at that time;
363 * otherwise, if the file is not supposed to be removed by the
364 * merge, the contents of the file will be placed in another
365 * unique filename.
366 *
367 * NOTE: This function relies on the fact that entries for a
368 * D/F conflict will appear adjacent in the index, with the
369 * entries for the file appearing before entries for paths
370 * below the corresponding directory.
371 */
372 const char *last_file = NULL;
373 int last_len = 0;
374 struct stage_data *last_e;
375 int i;
376 for (i = 0; i < entries->nr; i++) {
378 const char *path = entries->items[i].string;
379 int len = strlen(path);
380 struct stage_data *e = entries->items[i].util;
381 /*
383 * Check if last_file & path correspond to a D/F conflict;
384 * i.e. whether path is last_file+'/'+<something>.
385 * If so, remove last_file to make room for path and friends.
386 */
387 if (last_file &&
388 len > last_len &&
389 memcmp(path, last_file, last_len) == 0 &&
390 path[last_len] == '/') {
391 output(o, 3, "Removing %s to make room for subdirectory; may re-add later.", last_file);
392 unlink(last_file);
393 }
394 /*
396 * Determine whether path could exist as a file in the
397 * working directory as a possible D/F conflict. This
398 * will only occur when it exists in stage 2 as a
399 * file.
400 */
401 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
402 last_file = path;
403 last_len = len;
404 last_e = e;
405 } else {
406 last_file = NULL;
407 }
408 }
409}
410struct rename
412{
413 struct diff_filepair *pair;
414 struct stage_data *src_entry;
415 struct stage_data *dst_entry;
416 unsigned processed:1;
417};
418/*
420 * Get information of all renames which occurred between 'o_tree' and
421 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
422 * 'b_tree') to be able to associate the correct cache entries with
423 * the rename information. 'tree' is always equal to either a_tree or b_tree.
424 */
425static struct string_list *get_renames(struct merge_options *o,
426 struct tree *tree,
427 struct tree *o_tree,
428 struct tree *a_tree,
429 struct tree *b_tree,
430 struct string_list *entries)
431{
432 int i;
433 struct string_list *renames;
434 struct diff_options opts;
435 renames = xcalloc(1, sizeof(struct string_list));
437 diff_setup(&opts);
438 DIFF_OPT_SET(&opts, RECURSIVE);
439 opts.detect_rename = DIFF_DETECT_RENAME;
440 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
441 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
442 1000;
443 opts.rename_score = o->rename_score;
444 opts.show_rename_progress = o->show_rename_progress;
445 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
446 if (diff_setup_done(&opts) < 0)
447 die("diff setup failed");
448 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
449 diffcore_std(&opts);
450 if (opts.needed_rename_limit > o->needed_rename_limit)
451 o->needed_rename_limit = opts.needed_rename_limit;
452 for (i = 0; i < diff_queued_diff.nr; ++i) {
453 struct string_list_item *item;
454 struct rename *re;
455 struct diff_filepair *pair = diff_queued_diff.queue[i];
456 if (pair->status != 'R') {
457 diff_free_filepair(pair);
458 continue;
459 }
460 re = xmalloc(sizeof(*re));
461 re->processed = 0;
462 re->pair = pair;
463 item = string_list_lookup(entries, re->pair->one->path);
464 if (!item)
465 re->src_entry = insert_stage_data(re->pair->one->path,
466 o_tree, a_tree, b_tree, entries);
467 else
468 re->src_entry = item->util;
469 item = string_list_lookup(entries, re->pair->two->path);
471 if (!item)
472 re->dst_entry = insert_stage_data(re->pair->two->path,
473 o_tree, a_tree, b_tree, entries);
474 else
475 re->dst_entry = item->util;
476 item = string_list_insert(renames, pair->one->path);
477 item->util = re;
478 }
479 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
480 diff_queued_diff.nr = 0;
481 diff_flush(&opts);
482 return renames;
483}
484static int update_stages_options(const char *path, struct diff_filespec *o,
486 struct diff_filespec *a, struct diff_filespec *b,
487 int clear, int options)
488{
489 if (clear)
490 if (remove_file_from_cache(path))
491 return -1;
492 if (o)
493 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
494 return -1;
495 if (a)
496 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
497 return -1;
498 if (b)
499 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
500 return -1;
501 return 0;
502}
503static int update_stages(const char *path, struct diff_filespec *o,
505 struct diff_filespec *a, struct diff_filespec *b,
506 int clear)
507{
508 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
509 return update_stages_options(path, o, a, b, clear, options);
510}
511static int update_stages_and_entry(const char *path,
513 struct stage_data *entry,
514 struct diff_filespec *o,
515 struct diff_filespec *a,
516 struct diff_filespec *b,
517 int clear)
518{
519 int options;
520 entry->processed = 0;
522 entry->stages[1].mode = o->mode;
523 entry->stages[2].mode = a->mode;
524 entry->stages[3].mode = b->mode;
525 hashcpy(entry->stages[1].sha, o->sha1);
526 hashcpy(entry->stages[2].sha, a->sha1);
527 hashcpy(entry->stages[3].sha, b->sha1);
528 options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
529 return update_stages_options(path, o, a, b, clear, options);
530}
531static int remove_file(struct merge_options *o, int clean,
533 const char *path, int no_wd)
534{
535 int update_cache = o->call_depth || clean;
536 int update_working_directory = !o->call_depth && !no_wd;
537 if (update_cache) {
539 if (remove_file_from_cache(path))
540 return -1;
541 }
542 if (update_working_directory) {
543 if (remove_path(path))
544 return -1;
545 }
546 return 0;
547}
548static char *unique_path(struct merge_options *o, const char *path, const char *branch)
550{
551 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
552 int suffix = 0;
553 struct stat st;
554 char *p = newpath + strlen(path);
555 strcpy(newpath, path);
556 *(p++) = '~';
557 strcpy(p, branch);
558 for (; *p; ++p)
559 if ('/' == *p)
560 *p = '_';
561 while (string_list_has_string(&o->current_file_set, newpath) ||
562 string_list_has_string(&o->current_directory_set, newpath) ||
563 lstat(newpath, &st) == 0)
564 sprintf(p, "_%d", suffix++);
565 string_list_insert(&o->current_file_set, newpath);
567 return newpath;
568}
569static void flush_buffer(int fd, const char *buf, unsigned long size)
571{
572 while (size > 0) {
573 long ret = write_in_full(fd, buf, size);
574 if (ret < 0) {
575 /* Ignore epipe */
576 if (errno == EPIPE)
577 break;
578 die_errno("merge-recursive");
579 } else if (!ret) {
580 die("merge-recursive: disk full?");
581 }
582 size -= ret;
583 buf += ret;
584 }
585}
586static int would_lose_untracked(const char *path)
588{
589 int pos = cache_name_pos(path, strlen(path));
590 if (pos < 0)
592 pos = -1 - pos;
593 while (pos < active_nr &&
594 !strcmp(path, active_cache[pos]->name)) {
595 /*
596 * If stage #0, it is definitely tracked.
597 * If it has stage #2 then it was tracked
598 * before this merge started. All other
599 * cases the path was not tracked.
600 */
601 switch (ce_stage(active_cache[pos])) {
602 case 0:
603 case 2:
604 return 0;
605 }
606 pos++;
607 }
608 return file_exists(path);
609}
610static int make_room_for_path(const char *path)
612{
613 int status;
614 const char *msg = "failed to create path '%s'%s";
615 status = safe_create_leading_directories_const(path);
617 if (status) {
618 if (status == -3) {
619 /* something else exists */
620 error(msg, path, ": perhaps a D/F conflict?");
621 return -1;
622 }
623 die(msg, path, "");
624 }
625 /*
627 * Do not unlink a file in the work tree if we are not
628 * tracking it.
629 */
630 if (would_lose_untracked(path))
631 return error("refusing to lose untracked file at '%s'",
632 path);
633 /* Successful unlink is good.. */
635 if (!unlink(path))
636 return 0;
637 /* .. and so is no existing file */
638 if (errno == ENOENT)
639 return 0;
640 /* .. but not some other error (who really cares what?) */
641 return error(msg, path, ": perhaps a D/F conflict?");
642}
643static void update_file_flags(struct merge_options *o,
645 const unsigned char *sha,
646 unsigned mode,
647 const char *path,
648 int update_cache,
649 int update_wd)
650{
651 if (o->call_depth)
652 update_wd = 0;
653 if (update_wd) {
655 enum object_type type;
656 void *buf;
657 unsigned long size;
658 if (S_ISGITLINK(mode)) {
660 /*
661 * We may later decide to recursively descend into
662 * the submodule directory and update its index
663 * and/or work tree, but we do not do that now.
664 */
665 update_wd = 0;
666 goto update_index;
667 }
668 buf = read_sha1_file(sha, &type, &size);
670 if (!buf)
671 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
672 if (type != OBJ_BLOB)
673 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
674 if (S_ISREG(mode)) {
675 struct strbuf strbuf = STRBUF_INIT;
676 if (convert_to_working_tree(path, buf, size, &strbuf)) {
677 free(buf);
678 size = strbuf.len;
679 buf = strbuf_detach(&strbuf, NULL);
680 }
681 }
682 if (make_room_for_path(path) < 0) {
684 update_wd = 0;
685 free(buf);
686 goto update_index;
687 }
688 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
689 int fd;
690 if (mode & 0100)
691 mode = 0777;
692 else
693 mode = 0666;
694 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
695 if (fd < 0)
696 die_errno("failed to open '%s'", path);
697 flush_buffer(fd, buf, size);
698 close(fd);
699 } else if (S_ISLNK(mode)) {
700 char *lnk = xmemdupz(buf, size);
701 safe_create_leading_directories_const(path);
702 unlink(path);
703 if (symlink(lnk, path))
704 die_errno("failed to symlink '%s'", path);
705 free(lnk);
706 } else
707 die("do not know what to do with %06o %s '%s'",
708 mode, sha1_to_hex(sha), path);
709 free(buf);
710 }
711 update_index:
712 if (update_cache)
713 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
714}
715static void update_file(struct merge_options *o,
717 int clean,
718 const unsigned char *sha,
719 unsigned mode,
720 const char *path)
721{
722 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
723}
724/* Low level file merging, update and removal */
726struct merge_file_info
728{
729 unsigned char sha[20];
730 unsigned mode;
731 unsigned clean:1,
732 merge:1;
733};
734static int merge_3way(struct merge_options *o,
736 mmbuffer_t *result_buf,
737 struct diff_filespec *one,
738 struct diff_filespec *a,
739 struct diff_filespec *b,
740 const char *branch1,
741 const char *branch2)
742{
743 mmfile_t orig, src1, src2;
744 struct ll_merge_options ll_opts = {0};
745 char *base_name, *name1, *name2;
746 int merge_status;
747 ll_opts.renormalize = o->renormalize;
749 ll_opts.xdl_opts = o->xdl_opts;
750 if (o->call_depth) {
752 ll_opts.virtual_ancestor = 1;
753 ll_opts.variant = 0;
754 } else {
755 switch (o->recursive_variant) {
756 case MERGE_RECURSIVE_OURS:
757 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
758 break;
759 case MERGE_RECURSIVE_THEIRS:
760 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
761 break;
762 default:
763 ll_opts.variant = 0;
764 break;
765 }
766 }
767 if (strcmp(a->path, b->path) ||
769 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
770 base_name = o->ancestor == NULL ? NULL :
771 xstrdup(mkpath("%s:%s", o->ancestor, one->path));
772 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
773 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
774 } else {
775 base_name = o->ancestor == NULL ? NULL :
776 xstrdup(mkpath("%s", o->ancestor));
777 name1 = xstrdup(mkpath("%s", branch1));
778 name2 = xstrdup(mkpath("%s", branch2));
779 }
780 read_mmblob(&orig, one->sha1);
782 read_mmblob(&src1, a->sha1);
783 read_mmblob(&src2, b->sha1);
784 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
786 &src1, name1, &src2, name2, &ll_opts);
787 free(name1);
789 free(name2);
790 free(orig.ptr);
791 free(src1.ptr);
792 free(src2.ptr);
793 return merge_status;
794}
795static struct merge_file_info merge_file(struct merge_options *o,
797 struct diff_filespec *one,
798 struct diff_filespec *a,
799 struct diff_filespec *b,
800 const char *branch1,
801 const char *branch2)
802{
803 struct merge_file_info result;
804 result.merge = 0;
805 result.clean = 1;
806 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
808 result.clean = 0;
809 if (S_ISREG(a->mode)) {
810 result.mode = a->mode;
811 hashcpy(result.sha, a->sha1);
812 } else {
813 result.mode = b->mode;
814 hashcpy(result.sha, b->sha1);
815 }
816 } else {
817 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
818 result.merge = 1;
819 /*
821 * Merge modes
822 */
823 if (a->mode == b->mode || a->mode == one->mode)
824 result.mode = b->mode;
825 else {
826 result.mode = a->mode;
827 if (b->mode != one->mode) {
828 result.clean = 0;
829 result.merge = 1;
830 }
831 }
832 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
834 hashcpy(result.sha, b->sha1);
835 else if (sha_eq(b->sha1, one->sha1))
836 hashcpy(result.sha, a->sha1);
837 else if (S_ISREG(a->mode)) {
838 mmbuffer_t result_buf;
839 int merge_status;
840 merge_status = merge_3way(o, &result_buf, one, a, b,
842 branch1, branch2);
843 if ((merge_status < 0) || !result_buf.ptr)
845 die("Failed to execute internal merge");
846 if (write_sha1_file(result_buf.ptr, result_buf.size,
848 blob_type, result.sha))
849 die("Unable to add %s to database",
850 a->path);
851 free(result_buf.ptr);
853 result.clean = (merge_status == 0);
854 } else if (S_ISGITLINK(a->mode)) {
855 result.clean = merge_submodule(result.sha, one->path, one->sha1,
856 a->sha1, b->sha1);
857 } else if (S_ISLNK(a->mode)) {
858 hashcpy(result.sha, a->sha1);
859 if (!sha_eq(a->sha1, b->sha1))
861 result.clean = 0;
862 } else {
863 die("unsupported object type in the tree");
864 }
865 }
866 return result;
868}
869static void conflict_rename_delete(struct merge_options *o,
871 struct diff_filepair *pair,
872 const char *rename_branch,
873 const char *other_branch)
874{
875 char *dest_name = pair->two->path;
876 int df_conflict = 0;
877 struct stat st;
878 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
880 "and deleted in %s",
881 pair->one->path, pair->two->path, rename_branch,
882 other_branch);
883 if (!o->call_depth)
884 update_stages(dest_name, NULL,
885 rename_branch == o->branch1 ? pair->two : NULL,
886 rename_branch == o->branch1 ? NULL : pair->two,
887 1);
888 if (lstat(dest_name, &st) == 0 && S_ISDIR(st.st_mode)) {
889 dest_name = unique_path(o, dest_name, rename_branch);
890 df_conflict = 1;
891 }
892 update_file(o, 0, pair->two->sha1, pair->two->mode, dest_name);
893 if (df_conflict)
894 free(dest_name);
895}
896static void conflict_rename_rename_1to2(struct merge_options *o,
898 struct diff_filepair *pair1,
899 const char *branch1,
900 struct diff_filepair *pair2,
901 const char *branch2)
902{
903 /* One file was renamed in both branches, but to different names. */
904 char *del[2];
905 int delp = 0;
906 const char *ren1_dst = pair1->two->path;
907 const char *ren2_dst = pair2->two->path;
908 const char *dst_name1 = ren1_dst;
909 const char *dst_name2 = ren2_dst;
910 struct stat st;
911 if (lstat(ren1_dst, &st) == 0 && S_ISDIR(st.st_mode)) {
912 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
913 output(o, 1, "%s is a directory in %s adding as %s instead",
914 ren1_dst, branch2, dst_name1);
915 }
916 if (lstat(ren2_dst, &st) == 0 && S_ISDIR(st.st_mode)) {
917 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
918 output(o, 1, "%s is a directory in %s adding as %s instead",
919 ren2_dst, branch1, dst_name2);
920 }
921 if (o->call_depth) {
922 remove_file_from_cache(dst_name1);
923 remove_file_from_cache(dst_name2);
924 /*
925 * Uncomment to leave the conflicting names in the resulting tree
926 *
927 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
928 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
929 */
930 } else {
931 update_stages(ren1_dst, NULL, pair1->two, NULL, 1);
932 update_stages(ren2_dst, NULL, NULL, pair2->two, 1);
933 update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
935 update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
936 }
937 while (delp--)
938 free(del[delp]);
939}
940static void conflict_rename_rename_2to1(struct merge_options *o,
942 struct rename *ren1,
943 const char *branch1,
944 struct rename *ren2,
945 const char *branch2)
946{
947 /* Two files were renamed to the same thing. */
948 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
949 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
950 output(o, 1, "Renaming %s to %s and %s to %s instead",
951 ren1->pair->one->path, new_path1,
952 ren2->pair->one->path, new_path2);
953 remove_file(o, 0, ren1->pair->two->path, 0);
954 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
955 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
956 free(new_path2);
957 free(new_path1);
958}
959static int process_renames(struct merge_options *o,
961 struct string_list *a_renames,
962 struct string_list *b_renames)
963{
964 int clean_merge = 1, i, j;
965 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
966 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
967 const struct rename *sre;
968 for (i = 0; i < a_renames->nr; i++) {
970 sre = a_renames->items[i].util;
971 string_list_insert(&a_by_dst, sre->pair->two->path)->util
972 = sre->dst_entry;
973 }
974 for (i = 0; i < b_renames->nr; i++) {
975 sre = b_renames->items[i].util;
976 string_list_insert(&b_by_dst, sre->pair->two->path)->util
977 = sre->dst_entry;
978 }
979 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
981 char *src;
982 struct string_list *renames1, *renames2Dst;
983 struct rename *ren1 = NULL, *ren2 = NULL;
984 const char *branch1, *branch2;
985 const char *ren1_src, *ren1_dst;
986 if (i >= a_renames->nr) {
988 ren2 = b_renames->items[j++].util;
989 } else if (j >= b_renames->nr) {
990 ren1 = a_renames->items[i++].util;
991 } else {
992 int compare = strcmp(a_renames->items[i].string,
993 b_renames->items[j].string);
994 if (compare <= 0)
995 ren1 = a_renames->items[i++].util;
996 if (compare >= 0)
997 ren2 = b_renames->items[j++].util;
998 }
999 /* TODO: refactor, so that 1/2 are not needed */
1001 if (ren1) {
1002 renames1 = a_renames;
1003 renames2Dst = &b_by_dst;
1004 branch1 = o->branch1;
1005 branch2 = o->branch2;
1006 } else {
1007 struct rename *tmp;
1008 renames1 = b_renames;
1009 renames2Dst = &a_by_dst;
1010 branch1 = o->branch2;
1011 branch2 = o->branch1;
1012 tmp = ren2;
1013 ren2 = ren1;
1014 ren1 = tmp;
1015 }
1016 src = ren1->pair->one->path;
1017 ren1->dst_entry->processed = 1;
1019 ren1->src_entry->processed = 1;
1020 if (ren1->processed)
1022 continue;
1023 ren1->processed = 1;
1024 ren1_src = ren1->pair->one->path;
1026 ren1_dst = ren1->pair->two->path;
1027 if (ren2) {
1029 const char *ren2_src = ren2->pair->one->path;
1030 const char *ren2_dst = ren2->pair->two->path;
1031 /* Renamed in 1 and renamed in 2 */
1032 if (strcmp(ren1_src, ren2_src) != 0)
1033 die("ren1.src != ren2.src");
1034 ren2->dst_entry->processed = 1;
1035 ren2->processed = 1;
1036 if (strcmp(ren1_dst, ren2_dst) != 0) {
1037 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO,
1038 ren1->pair,
1039 ren2->pair,
1040 branch1,
1041 branch2,
1042 ren1->dst_entry,
1043 ren2->dst_entry);
1044 } else {
1045 remove_file(o, 1, ren1_src, 1);
1046 update_stages_and_entry(ren1_dst,
1047 ren1->dst_entry,
1048 ren1->pair->one,
1049 ren1->pair->two,
1050 ren2->pair->two,
1051 1 /* clear */);
1052 }
1053 } else {
1054 /* Renamed in 1, maybe changed in 2 */
1055 struct string_list_item *item;
1056 /* we only use sha1 and mode of these */
1057 struct diff_filespec src_other, dst_other;
1058 int try_merge;
1059 /*
1061 * unpack_trees loads entries from common-commit
1062 * into stage 1, from head-commit into stage 2, and
1063 * from merge-commit into stage 3. We keep track
1064 * of which side corresponds to the rename.
1065 */
1066 int renamed_stage = a_renames == renames1 ? 2 : 3;
1067 int other_stage = a_renames == renames1 ? 3 : 2;
1068 remove_file(o, 1, ren1_src, o->call_depth || renamed_stage == 2);
1070 hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
1072 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1073 hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
1074 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1075 try_merge = 0;
1076 if (sha_eq(src_other.sha1, null_sha1)) {
1078 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
1079 ren1->dst_entry->processed = 0;
1080 setup_rename_df_conflict_info(RENAME_DELETE,
1081 ren1->pair,
1082 NULL,
1083 branch1,
1084 branch2,
1085 ren1->dst_entry,
1086 NULL);
1087 } else {
1088 clean_merge = 0;
1089 conflict_rename_delete(o, ren1->pair, branch1, branch2);
1090 }
1091 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1092 sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
1093 /* Added file on the other side
1094 identical to the file being
1095 renamed: clean merge */
1096 update_file(o, 1, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
1097 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
1098 const char *new_path;
1099 clean_merge = 0;
1100 try_merge = 1;
1101 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1102 "%s added in %s",
1103 ren1_src, ren1_dst, branch1,
1104 ren1_dst, branch2);
1105 if (o->call_depth) {
1106 struct merge_file_info mfi;
1107 struct diff_filespec one, a, b;
1108 one.path = a.path = b.path =
1110 (char *)ren1_dst;
1111 hashcpy(one.sha1, null_sha1);
1112 one.mode = 0;
1113 hashcpy(a.sha1, ren1->pair->two->sha1);
1114 a.mode = ren1->pair->two->mode;
1115 hashcpy(b.sha1, dst_other.sha1);
1116 b.mode = dst_other.mode;
1117 mfi = merge_file(o, &one, &a, &b,
1118 branch1,
1119 branch2);
1120 output(o, 1, "Adding merged %s", ren1_dst);
1121 update_file(o, 0,
1122 mfi.sha,
1123 mfi.mode,
1124 ren1_dst);
1125 try_merge = 0;
1126 } else {
1127 new_path = unique_path(o, ren1_dst, branch2);
1128 output(o, 1, "Adding as %s instead", new_path);
1129 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1130 }
1131 } else if ((item = string_list_lookup(renames2Dst, ren1_dst))) {
1132 ren2 = item->util;
1133 clean_merge = 0;
1134 ren2->processed = 1;
1135 output(o, 1, "CONFLICT (rename/rename): "
1136 "Rename %s->%s in %s. "
1137 "Rename %s->%s in %s",
1138 ren1_src, ren1_dst, branch1,
1139 ren2->pair->one->path, ren2->pair->two->path, branch2);
1140 conflict_rename_rename_2to1(o, ren1, branch1, ren2, branch2);
1141 } else
1142 try_merge = 1;
1143 if (try_merge) {
1145 struct diff_filespec *one, *a, *b;
1146 src_other.path = (char *)ren1_src;
1147 one = ren1->pair->one;
1149 if (a_renames == renames1) {
1150 a = ren1->pair->two;
1151 b = &src_other;
1152 } else {
1153 b = ren1->pair->two;
1154 a = &src_other;
1155 }
1156 update_stages_and_entry(ren1_dst, ren1->dst_entry, one, a, b, 1);
1157 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
1158 setup_rename_df_conflict_info(RENAME_NORMAL,
1159 ren1->pair,
1160 NULL,
1161 branch1,
1162 NULL,
1163 ren1->dst_entry,
1164 NULL);
1165 }
1166 }
1167 }
1168 }
1169 string_list_clear(&a_by_dst, 0);
1170 string_list_clear(&b_by_dst, 0);
1171 return clean_merge;
1173}
1174static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1176{
1177 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1178}
1179static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1181{
1182 void *buf;
1183 enum object_type type;
1184 unsigned long size;
1185 buf = read_sha1_file(sha1, &type, &size);
1186 if (!buf)
1187 return error("cannot read object %s", sha1_to_hex(sha1));
1188 if (type != OBJ_BLOB) {
1189 free(buf);
1190 return error("object %s is not a blob", sha1_to_hex(sha1));
1191 }
1192 strbuf_attach(dst, buf, size, size + 1);
1193 return 0;
1194}
1195static int blob_unchanged(const unsigned char *o_sha,
1197 const unsigned char *a_sha,
1198 int renormalize, const char *path)
1199{
1200 struct strbuf o = STRBUF_INIT;
1201 struct strbuf a = STRBUF_INIT;
1202 int ret = 0; /* assume changed for safety */
1203 if (sha_eq(o_sha, a_sha))
1205 return 1;
1206 if (!renormalize)
1207 return 0;
1208 assert(o_sha && a_sha);
1210 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1211 goto error_return;
1212 /*
1213 * Note: binary | is used so that both renormalizations are
1214 * performed. Comparison can be skipped if both files are
1215 * unchanged since their sha1s have already been compared.
1216 */
1217 if (renormalize_buffer(path, o.buf, o.len, &o) |
1218 renormalize_buffer(path, a.buf, o.len, &a))
1219 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1220error_return:
1222 strbuf_release(&o);
1223 strbuf_release(&a);
1224 return ret;
1225}
1226static void handle_delete_modify(struct merge_options *o,
1228 const char *path,
1229 const char *new_path,
1230 unsigned char *a_sha, int a_mode,
1231 unsigned char *b_sha, int b_mode)
1232{
1233 if (!a_sha) {
1234 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1235 "and modified in %s. Version %s of %s left in tree%s%s.",
1236 path, o->branch1,
1237 o->branch2, o->branch2, path,
1238 path == new_path ? "" : " at ",
1239 path == new_path ? "" : new_path);
1240 update_file(o, 0, b_sha, b_mode, new_path);
1241 } else {
1242 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1243 "and modified in %s. Version %s of %s left in tree%s%s.",
1244 path, o->branch2,
1245 o->branch1, o->branch1, path,
1246 path == new_path ? "" : " at ",
1247 path == new_path ? "" : new_path);
1248 update_file(o, 0, a_sha, a_mode, new_path);
1249 }
1250}
1251static int merge_content(struct merge_options *o,
1253 const char *path,
1254 unsigned char *o_sha, int o_mode,
1255 unsigned char *a_sha, int a_mode,
1256 unsigned char *b_sha, int b_mode,
1257 const char *df_rename_conflict_branch)
1258{
1259 const char *reason = "content";
1260 struct merge_file_info mfi;
1261 struct diff_filespec one, a, b;
1262 struct stat st;
1263 unsigned df_conflict_remains = 0;
1264 if (!o_sha) {
1266 reason = "add/add";
1267 o_sha = (unsigned char *)null_sha1;
1268 }
1269 one.path = a.path = b.path = (char *)path;
1270 hashcpy(one.sha1, o_sha);
1271 one.mode = o_mode;
1272 hashcpy(a.sha1, a_sha);
1273 a.mode = a_mode;
1274 hashcpy(b.sha1, b_sha);
1275 b.mode = b_mode;
1276 mfi = merge_file(o, &one, &a, &b, o->branch1, o->branch2);
1278 if (df_rename_conflict_branch &&
1279 lstat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
1280 df_conflict_remains = 1;
1281 }
1282 if (mfi.clean && !df_conflict_remains &&
1284 sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode)
1285 output(o, 3, "Skipped %s (merged same as existing)", path);
1286 else
1287 output(o, 2, "Auto-merging %s", path);
1288 if (!mfi.clean) {
1290 if (S_ISGITLINK(mfi.mode))
1291 reason = "submodule";
1292 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
1293 reason, path);
1294 }
1295 if (df_conflict_remains) {
1297 const char *new_path;
1298 update_file_flags(o, mfi.sha, mfi.mode, path,
1299 o->call_depth || mfi.clean, 0);
1300 new_path = unique_path(o, path, df_rename_conflict_branch);
1301 mfi.clean = 0;
1302 output(o, 1, "Adding as %s instead", new_path);
1303 update_file_flags(o, mfi.sha, mfi.mode, new_path, 0, 1);
1304 } else {
1305 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1306 }
1307 return mfi.clean;
1308}
1310/* Per entry merge function */
1312static int process_entry(struct merge_options *o,
1313 const char *path, struct stage_data *entry)
1314{
1315 /*
1316 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1317 print_index_entry("\tpath: ", entry);
1318 */
1319 int clean_merge = 1;
1320 int normalize = o->renormalize;
1321 unsigned o_mode = entry->stages[1].mode;
1322 unsigned a_mode = entry->stages[2].mode;
1323 unsigned b_mode = entry->stages[3].mode;
1324 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1325 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1326 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1327 if (entry->rename_df_conflict_info)
1329 return 1; /* Such cases are handled elsewhere. */
1330 entry->processed = 1;
1332 if (o_sha && (!a_sha || !b_sha)) {
1333 /* Case A: Deleted in one */
1334 if ((!a_sha && !b_sha) ||
1335 (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) ||
1336 (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) {
1337 /* Deleted in both or deleted in one and
1338 * unchanged in the other */
1339 if (a_sha)
1340 output(o, 2, "Removing %s", path);
1341 /* do not touch working file if it did not exist */
1342 remove_file(o, 1, path, !a_sha);
1343 } else if (string_list_has_string(&o->current_directory_set,
1344 path)) {
1345 entry->processed = 0;
1346 return 1; /* Assume clean until processed */
1347 } else {
1348 /* Deleted in one and changed in the other */
1349 clean_merge = 0;
1350 handle_delete_modify(o, path, path,
1351 a_sha, a_mode, b_sha, b_mode);
1352 }
1353 } else if ((!o_sha && a_sha && !b_sha) ||
1355 (!o_sha && !a_sha && b_sha)) {
1356 /* Case B: Added in one. */
1357 unsigned mode;
1358 const unsigned char *sha;
1359 if (a_sha) {
1361 mode = a_mode;
1362 sha = a_sha;
1363 } else {
1364 mode = b_mode;
1365 sha = b_sha;
1366 }
1367 if (string_list_has_string(&o->current_directory_set, path)) {
1368 /* Handle D->F conflicts after all subfiles */
1369 entry->processed = 0;
1370 return 1; /* Assume clean until processed */
1371 } else {
1372 output(o, 2, "Adding %s", path);
1373 update_file(o, 1, sha, mode, path);
1374 }
1375 } else if (a_sha && b_sha) {
1376 /* Case C: Added in both (check for same permissions) and */
1377 /* case D: Modified in both, but differently. */
1378 clean_merge = merge_content(o, path,
1379 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1380 NULL);
1381 } else if (!o_sha && !a_sha && !b_sha) {
1382 /*
1383 * this entry was deleted altogether. a_mode == 0 means
1384 * we had that path and want to actively remove it.
1385 */
1386 remove_file(o, 1, path, !a_mode);
1387 } else
1388 die("Fatal merge failure, shouldn't happen.");
1389 return clean_merge;
1391}
1392/*
1394 * Per entry merge function for D/F (and/or rename) conflicts. In the
1395 * cases we can cleanly resolve D/F conflicts, process_entry() can
1396 * clean out all the files below the directory for us. All D/F
1397 * conflict cases must be handled here at the end to make sure any
1398 * directories that can be cleaned out, are.
1399 *
1400 * Some rename conflicts may also be handled here that don't necessarily
1401 * involve D/F conflicts, since the code to handle them is generic enough
1402 * to handle those rename conflicts with or without D/F conflicts also
1403 * being involved.
1404 */
1405static int process_df_entry(struct merge_options *o,
1406 const char *path, struct stage_data *entry)
1407{
1408 int clean_merge = 1;
1409 unsigned o_mode = entry->stages[1].mode;
1410 unsigned a_mode = entry->stages[2].mode;
1411 unsigned b_mode = entry->stages[3].mode;
1412 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1413 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1414 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1415 struct stat st;
1416 entry->processed = 1;
1418 if (entry->rename_df_conflict_info) {
1419 struct rename_df_conflict_info *conflict_info = entry->rename_df_conflict_info;
1420 char *src;
1421 switch (conflict_info->rename_type) {
1422 case RENAME_NORMAL:
1423 clean_merge = merge_content(o, path,
1424 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1425 conflict_info->branch1);
1426 break;
1427 case RENAME_DELETE:
1428 clean_merge = 0;
1429 conflict_rename_delete(o, conflict_info->pair1,
1430 conflict_info->branch1,
1431 conflict_info->branch2);
1432 break;
1433 case RENAME_ONE_FILE_TO_TWO:
1434 src = conflict_info->pair1->one->path;
1435 clean_merge = 0;
1436 output(o, 1, "CONFLICT (rename/rename): "
1437 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1438 "rename \"%s\"->\"%s\" in \"%s\"%s",
1439 src, conflict_info->pair1->two->path, conflict_info->branch1,
1440 src, conflict_info->pair2->two->path, conflict_info->branch2,
1441 o->call_depth ? " (left unresolved)" : "");
1442 if (o->call_depth) {
1443 remove_file_from_cache(src);
1444 update_file(o, 0, conflict_info->pair1->one->sha1,
1445 conflict_info->pair1->one->mode, src);
1446 }
1447 conflict_rename_rename_1to2(o, conflict_info->pair1,
1448 conflict_info->branch1,
1449 conflict_info->pair2,
1450 conflict_info->branch2);
1451 conflict_info->dst_entry2->processed = 1;
1452 break;
1453 default:
1454 entry->processed = 0;
1455 break;
1456 }
1457 } else if (o_sha && (!a_sha || !b_sha)) {
1458 /* Modify/delete; deleted side may have put a directory in the way */
1459 const char *new_path = path;
1460 if (lstat(path, &st) == 0 && S_ISDIR(st.st_mode))
1461 new_path = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1462 clean_merge = 0;
1463 handle_delete_modify(o, path, new_path,
1464 a_sha, a_mode, b_sha, b_mode);
1465 } else if (!o_sha && !!a_sha != !!b_sha) {
1466 /* directory -> (directory, file) */
1467 const char *add_branch;
1468 const char *other_branch;
1469 unsigned mode;
1470 const unsigned char *sha;
1471 const char *conf;
1472 if (a_sha) {
1474 add_branch = o->branch1;
1475 other_branch = o->branch2;
1476 mode = a_mode;
1477 sha = a_sha;
1478 conf = "file/directory";
1479 } else {
1480 add_branch = o->branch2;
1481 other_branch = o->branch1;
1482 mode = b_mode;
1483 sha = b_sha;
1484 conf = "directory/file";
1485 }
1486 if (lstat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
1487 const char *new_path = unique_path(o, path, add_branch);
1488 clean_merge = 0;
1489 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1490 "Adding %s as %s",
1491 conf, path, other_branch, path, new_path);
1492 update_file(o, 0, sha, mode, new_path);
1493 } else {
1494 output(o, 2, "Adding %s", path);
1495 update_file(o, 1, sha, mode, path);
1496 }
1497 } else {
1498 entry->processed = 0;
1499 return 1; /* not handled; assume clean until processed */
1500 }
1501 return clean_merge;
1503}
1504int merge_trees(struct merge_options *o,
1506 struct tree *head,
1507 struct tree *merge,
1508 struct tree *common,
1509 struct tree **result)
1510{
1511 int code, clean;
1512 if (o->subtree_shift) {
1514 merge = shift_tree_object(head, merge, o->subtree_shift);
1515 common = shift_tree_object(head, common, o->subtree_shift);
1516 }
1517 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1519 output(o, 0, "Already up-to-date!");
1520 *result = head;
1521 return 1;
1522 }
1523 code = git_merge_trees(o->call_depth, common, head, merge);
1525 if (code != 0) {
1527 if (show(o, 4) || o->call_depth)
1528 die("merging of trees %s and %s failed",
1529 sha1_to_hex(head->object.sha1),
1530 sha1_to_hex(merge->object.sha1));
1531 else
1532 exit(128);
1533 }
1534 if (unmerged_cache()) {
1536 struct string_list *entries, *re_head, *re_merge;
1537 int i;
1538 string_list_clear(&o->current_file_set, 1);
1539 string_list_clear(&o->current_directory_set, 1);
1540 get_files_dirs(o, head);
1541 get_files_dirs(o, merge);
1542 entries = get_unmerged();
1544 make_room_for_directories_of_df_conflicts(o, entries);
1545 re_head = get_renames(o, head, common, head, merge, entries);
1546 re_merge = get_renames(o, merge, common, head, merge, entries);
1547 clean = process_renames(o, re_head, re_merge);
1548 for (i = 0; i < entries->nr; i++) {
1549 const char *path = entries->items[i].string;
1550 struct stage_data *e = entries->items[i].util;
1551 if (!e->processed
1552 && !process_entry(o, path, e))
1553 clean = 0;
1554 }
1555 for (i = 0; i < entries->nr; i++) {
1556 const char *path = entries->items[i].string;
1557 struct stage_data *e = entries->items[i].util;
1558 if (!e->processed
1559 && !process_df_entry(o, path, e))
1560 clean = 0;
1561 }
1562 for (i = 0; i < entries->nr; i++) {
1563 struct stage_data *e = entries->items[i].util;
1564 if (!e->processed)
1565 die("Unprocessed path??? %s",
1566 entries->items[i].string);
1567 }
1568 string_list_clear(re_merge, 0);
1570 string_list_clear(re_head, 0);
1571 string_list_clear(entries, 1);
1572 }
1574 else
1575 clean = 1;
1576 if (o->call_depth)
1578 *result = write_tree_from_memory(o);
1579 return clean;
1581}
1582static struct commit_list *reverse_commit_list(struct commit_list *list)
1584{
1585 struct commit_list *next = NULL, *current, *backup;
1586 for (current = list; current; current = backup) {
1587 backup = current->next;
1588 current->next = next;
1589 next = current;
1590 }
1591 return next;
1592}
1593/*
1595 * Merge the commits h1 and h2, return the resulting virtual
1596 * commit object and a flag indicating the cleanness of the merge.
1597 */
1598int merge_recursive(struct merge_options *o,
1599 struct commit *h1,
1600 struct commit *h2,
1601 struct commit_list *ca,
1602 struct commit **result)
1603{
1604 struct commit_list *iter;
1605 struct commit *merged_common_ancestors;
1606 struct tree *mrtree = mrtree;
1607 int clean;
1608 if (show(o, 4)) {
1610 output(o, 4, "Merging:");
1611 output_commit_title(o, h1);
1612 output_commit_title(o, h2);
1613 }
1614 if (!ca) {
1616 ca = get_merge_bases(h1, h2, 1);
1617 ca = reverse_commit_list(ca);
1618 }
1619 if (show(o, 5)) {
1621 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
1622 for (iter = ca; iter; iter = iter->next)
1623 output_commit_title(o, iter->item);
1624 }
1625 merged_common_ancestors = pop_commit(&ca);
1627 if (merged_common_ancestors == NULL) {
1628 /* if there is no common ancestor, make an empty tree */
1629 struct tree *tree = xcalloc(1, sizeof(struct tree));
1630 tree->object.parsed = 1;
1632 tree->object.type = OBJ_TREE;
1633 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1634 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1635 }
1636 for (iter = ca; iter; iter = iter->next) {
1638 const char *saved_b1, *saved_b2;
1639 o->call_depth++;
1640 /*
1641 * When the merge fails, the result contains files
1642 * with conflict markers. The cleanness flag is
1643 * ignored, it was never actually used, as result of
1644 * merge_trees has always overwritten it: the committed
1645 * "conflicts" were already resolved.
1646 */
1647 discard_cache();
1648 saved_b1 = o->branch1;
1649 saved_b2 = o->branch2;
1650 o->branch1 = "Temporary merge branch 1";
1651 o->branch2 = "Temporary merge branch 2";
1652 merge_recursive(o, merged_common_ancestors, iter->item,
1653 NULL, &merged_common_ancestors);
1654 o->branch1 = saved_b1;
1655 o->branch2 = saved_b2;
1656 o->call_depth--;
1657 if (!merged_common_ancestors)
1659 die("merge returned no commit");
1660 }
1661 discard_cache();
1663 if (!o->call_depth)
1664 read_cache();
1665 o->ancestor = "merged common ancestors";
1667 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1668 &mrtree);
1669 if (o->call_depth) {
1671 *result = make_virtual_commit(mrtree, "merged tree");
1672 commit_list_insert(h1, &(*result)->parents);
1673 commit_list_insert(h2, &(*result)->parents->next);
1674 }
1675 flush_output(o);
1676 if (o->needed_rename_limit)
1677 warning(rename_limit_advice, o->needed_rename_limit);
1678 return clean;
1679}
1680static struct commit *get_ref(const unsigned char *sha1, const char *name)
1682{
1683 struct object *object;
1684 object = deref_tag(parse_object(sha1), name, strlen(name));
1686 if (!object)
1687 return NULL;
1688 if (object->type == OBJ_TREE)
1689 return make_virtual_commit((struct tree*)object, name);
1690 if (object->type != OBJ_COMMIT)
1691 return NULL;
1692 if (parse_commit((struct commit *)object))
1693 return NULL;
1694 return (struct commit *)object;
1695}
1696int merge_recursive_generic(struct merge_options *o,
1698 const unsigned char *head,
1699 const unsigned char *merge,
1700 int num_base_list,
1701 const unsigned char **base_list,
1702 struct commit **result)
1703{
1704 int clean, index_fd;
1705 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1706 struct commit *head_commit = get_ref(head, o->branch1);
1707 struct commit *next_commit = get_ref(merge, o->branch2);
1708 struct commit_list *ca = NULL;
1709 if (base_list) {
1711 int i;
1712 for (i = 0; i < num_base_list; ++i) {
1713 struct commit *base;
1714 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1715 return error("Could not parse object '%s'",
1716 sha1_to_hex(base_list[i]));
1717 commit_list_insert(base, &ca);
1718 }
1719 }
1720 index_fd = hold_locked_index(lock, 1);
1722 clean = merge_recursive(o, head_commit, next_commit, ca,
1723 result);
1724 if (active_cache_changed &&
1725 (write_cache(index_fd, active_cache, active_nr) ||
1726 commit_locked_index(lock)))
1727 return error("Unable to write index.");
1728 return clean ? 0 : 1;
1730}
1731static int merge_recursive_config(const char *var, const char *value, void *cb)
1733{
1734 struct merge_options *o = cb;
1735 if (!strcasecmp(var, "merge.verbosity")) {
1736 o->verbosity = git_config_int(var, value);
1737 return 0;
1738 }
1739 if (!strcasecmp(var, "diff.renamelimit")) {
1740 o->diff_rename_limit = git_config_int(var, value);
1741 return 0;
1742 }
1743 if (!strcasecmp(var, "merge.renamelimit")) {
1744 o->merge_rename_limit = git_config_int(var, value);
1745 return 0;
1746 }
1747 return git_xmerge_config(var, value, cb);
1748}
1749void init_merge_options(struct merge_options *o)
1751{
1752 memset(o, 0, sizeof(struct merge_options));
1753 o->verbosity = 2;
1754 o->buffer_output = 1;
1755 o->diff_rename_limit = -1;
1756 o->merge_rename_limit = -1;
1757 o->renormalize = 0;
1758 git_config(merge_recursive_config, o);
1759 if (getenv("GIT_MERGE_VERBOSITY"))
1760 o->verbosity =
1761 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1762 if (o->verbosity >= 5)
1763 o->buffer_output = 0;
1764 strbuf_init(&o->obuf, 0);
1765 memset(&o->current_file_set, 0, sizeof(struct string_list));
1766 o->current_file_set.strdup_strings = 1;
1767 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1768 o->current_directory_set.strdup_strings = 1;
1769}
1770int parse_merge_opt(struct merge_options *o, const char *s)
1772{
1773 if (!s || !*s)
1774 return -1;
1775 if (!strcmp(s, "ours"))
1776 o->recursive_variant = MERGE_RECURSIVE_OURS;
1777 else if (!strcmp(s, "theirs"))
1778 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
1779 else if (!strcmp(s, "subtree"))
1780 o->subtree_shift = "";
1781 else if (!prefixcmp(s, "subtree="))
1782 o->subtree_shift = s + strlen("subtree=");
1783 else if (!strcmp(s, "patience"))
1784 o->xdl_opts |= XDF_PATIENCE_DIFF;
1785 else if (!strcmp(s, "ignore-space-change"))
1786 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
1787 else if (!strcmp(s, "ignore-all-space"))
1788 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
1789 else if (!strcmp(s, "ignore-space-at-eol"))
1790 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
1791 else if (!strcmp(s, "renormalize"))
1792 o->renormalize = 1;
1793 else if (!strcmp(s, "no-renormalize"))
1794 o->renormalize = 0;
1795 else if (!prefixcmp(s, "rename-threshold=")) {
1796 const char *score = s + strlen("rename-threshold=");
1797 if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0)
1798 return -1;
1799 }
1800 else
1801 return -1;
1802 return 0;
1803}