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 struct tree *shift_tree_object(struct tree *one, struct tree *two,
26 const char *subtree_shift)
27{
28 unsigned char shifted[20];
29 if (!*subtree_shift) {
31 shift_tree(one->object.sha1, two->object.sha1, shifted, 0);
32 } else {
33 shift_tree_by(one->object.sha1, two->object.sha1, shifted,
34 subtree_shift);
35 }
36 if (!hashcmp(two->object.sha1, shifted))
37 return two;
38 return lookup_tree(shifted);
39}
40/*
42 * A virtual commit has (const char *)commit->util set to the name.
43 */
44static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
46{
47 struct commit *commit = xcalloc(1, sizeof(struct commit));
48 commit->tree = tree;
49 commit->util = (void*)comment;
50 /* avoid warnings */
51 commit->object.parsed = 1;
52 return commit;
53}
54/*
56 * Since we use get_tree_entry(), which does not put the read object into
57 * the object pool, we cannot rely on a == b.
58 */
59static int sha_eq(const unsigned char *a, const unsigned char *b)
60{
61 if (!a && !b)
62 return 2;
63 return a && b && hashcmp(a, b) == 0;
64}
65enum rename_type {
67 RENAME_NORMAL = 0,
68 RENAME_DELETE,
69 RENAME_ONE_FILE_TO_TWO
70};
71struct rename_df_conflict_info {
73 enum rename_type rename_type;
74 struct diff_filepair *pair1;
75 struct diff_filepair *pair2;
76 const char *branch1;
77 const char *branch2;
78 struct stage_data *dst_entry1;
79 struct stage_data *dst_entry2;
80};
81/*
83 * Since we want to write the index eventually, we cannot reuse the index
84 * for these (temporary) data.
85 */
86struct stage_data
87{
88 struct
89 {
90 unsigned mode;
91 unsigned char sha[20];
92 } stages[4];
93 struct rename_df_conflict_info *rename_df_conflict_info;
94 unsigned processed:1;
95};
96static inline void setup_rename_df_conflict_info(enum rename_type rename_type,
98 struct diff_filepair *pair1,
99 struct diff_filepair *pair2,
100 const char *branch1,
101 const char *branch2,
102 struct stage_data *dst_entry1,
103 struct stage_data *dst_entry2)
104{
105 struct rename_df_conflict_info *ci = xcalloc(1, sizeof(struct rename_df_conflict_info));
106 ci->rename_type = rename_type;
107 ci->pair1 = pair1;
108 ci->branch1 = branch1;
109 ci->branch2 = branch2;
110 ci->dst_entry1 = dst_entry1;
112 dst_entry1->rename_df_conflict_info = ci;
113 dst_entry1->processed = 0;
114 assert(!pair2 == !dst_entry2);
116 if (dst_entry2) {
117 ci->dst_entry2 = dst_entry2;
118 ci->pair2 = pair2;
119 dst_entry2->rename_df_conflict_info = ci;
120 dst_entry2->processed = 0;
121 }
122}
123static int show(struct merge_options *o, int v)
125{
126 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
127}
128static void flush_output(struct merge_options *o)
130{
131 if (o->obuf.len) {
132 fputs(o->obuf.buf, stdout);
133 strbuf_reset(&o->obuf);
134 }
135}
136__attribute__((format (printf, 3, 4)))
138static void output(struct merge_options *o, int v, const char *fmt, ...)
139{
140 int len;
141 va_list ap;
142 if (!show(o, v))
144 return;
145 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
147 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
148 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
149 va_start(ap, fmt);
151 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
152 va_end(ap);
153 if (len < 0)
155 len = 0;
156 if (len >= strbuf_avail(&o->obuf)) {
157 strbuf_grow(&o->obuf, len + 2);
158 va_start(ap, fmt);
159 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
160 va_end(ap);
161 if (len >= strbuf_avail(&o->obuf)) {
162 die("this should not happen, your snprintf is broken");
163 }
164 }
165 strbuf_setlen(&o->obuf, o->obuf.len + len);
166 strbuf_add(&o->obuf, "\n", 1);
167 if (!o->buffer_output)
168 flush_output(o);
169}
170static void output_commit_title(struct merge_options *o, struct commit *commit)
172{
173 int i;
174 flush_output(o);
175 for (i = o->call_depth; i--;)
176 fputs(" ", stdout);
177 if (commit->util)
178 printf("virtual %s\n", (char *)commit->util);
179 else {
180 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
181 if (parse_commit(commit) != 0)
182 printf("(bad commit)\n");
183 else {
184 const char *title;
185 int len = find_commit_subject(commit->buffer, &title);
186 if (len)
187 printf("%.*s\n", len, title);
188 }
189 }
190}
191static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
193 const char *path, int stage, int refresh, int options)
194{
195 struct cache_entry *ce;
196 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
197 if (!ce)
198 return error("addinfo_cache failed for path '%s'", path);
199 return add_cache_entry(ce, options);
200}
201static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
203{
204 parse_tree(tree);
205 init_tree_desc(desc, tree->buffer, tree->size);
206}
207static int git_merge_trees(int index_only,
209 struct tree *common,
210 struct tree *head,
211 struct tree *merge)
212{
213 int rc;
214 struct tree_desc t[3];
215 struct unpack_trees_options opts;
216 memset(&opts, 0, sizeof(opts));
218 if (index_only)
219 opts.index_only = 1;
220 else
221 opts.update = 1;
222 opts.merge = 1;
223 opts.head_idx = 2;
224 opts.fn = threeway_merge;
225 opts.src_index = &the_index;
226 opts.dst_index = &the_index;
227 setup_unpack_trees_porcelain(&opts, "merge");
228 init_tree_desc_from_tree(t+0, common);
230 init_tree_desc_from_tree(t+1, head);
231 init_tree_desc_from_tree(t+2, merge);
232 rc = unpack_trees(3, t, &opts);
234 cache_tree_free(&active_cache_tree);
235 return rc;
236}
237struct tree *write_tree_from_memory(struct merge_options *o)
239{
240 struct tree *result = NULL;
241 if (unmerged_cache()) {
243 int i;
244 fprintf(stderr, "BUG: There are unmerged index entries:\n");
245 for (i = 0; i < active_nr; i++) {
246 struct cache_entry *ce = active_cache[i];
247 if (ce_stage(ce))
248 fprintf(stderr, "BUG: %d %.*s", ce_stage(ce),
249 (int)ce_namelen(ce), ce->name);
250 }
251 die("Bug in merge-recursive.c");
252 }
253 if (!active_cache_tree)
255 active_cache_tree = cache_tree();
256 if (!cache_tree_fully_valid(active_cache_tree) &&
258 cache_tree_update(active_cache_tree,
259 active_cache, active_nr, 0, 0) < 0)
260 die("error building trees");
261 result = lookup_tree(active_cache_tree->sha1);
263 return result;
265}
266static int save_files_dirs(const unsigned char *sha1,
268 const char *base, int baselen, const char *path,
269 unsigned int mode, int stage, void *context)
270{
271 int len = strlen(path);
272 char *newpath = xmalloc(baselen + len + 1);
273 struct merge_options *o = context;
274 memcpy(newpath, base, baselen);
276 memcpy(newpath + baselen, path, len);
277 newpath[baselen + len] = '\0';
278 if (S_ISDIR(mode))
280 string_list_insert(&o->current_directory_set, newpath);
281 else
282 string_list_insert(&o->current_file_set, newpath);
283 free(newpath);
284 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
286}
287static int get_files_dirs(struct merge_options *o, struct tree *tree)
289{
290 int n;
291 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
292 return 0;
293 n = o->current_file_set.nr + o->current_directory_set.nr;
294 return n;
295}
296/*
298 * Returns an index_entry instance which doesn't have to correspond to
299 * a real cache entry in Git's index.
300 */
301static struct stage_data *insert_stage_data(const char *path,
302 struct tree *o, struct tree *a, struct tree *b,
303 struct string_list *entries)
304{
305 struct string_list_item *item;
306 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
307 get_tree_entry(o->object.sha1, path,
308 e->stages[1].sha, &e->stages[1].mode);
309 get_tree_entry(a->object.sha1, path,
310 e->stages[2].sha, &e->stages[2].mode);
311 get_tree_entry(b->object.sha1, path,
312 e->stages[3].sha, &e->stages[3].mode);
313 item = string_list_insert(entries, path);
314 item->util = e;
315 return e;
316}
317/*
319 * Create a dictionary mapping file names to stage_data objects. The
320 * dictionary contains one entry for every path with a non-zero stage entry.
321 */
322static struct string_list *get_unmerged(void)
323{
324 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
325 int i;
326 unmerged->strdup_strings = 1;
328 for (i = 0; i < active_nr; i++) {
330 struct string_list_item *item;
331 struct stage_data *e;
332 struct cache_entry *ce = active_cache[i];
333 if (!ce_stage(ce))
334 continue;
335 item = string_list_lookup(unmerged, ce->name);
337 if (!item) {
338 item = string_list_insert(unmerged, ce->name);
339 item->util = xcalloc(1, sizeof(struct stage_data));
340 }
341 e = item->util;
342 e->stages[ce_stage(ce)].mode = ce->ce_mode;
343 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
344 }
345 return unmerged;
347}
348static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
350 struct string_list *entries)
351{
352 /* If there are D/F conflicts, and the paths currently exist
353 * in the working copy as a file, we want to remove them to
354 * make room for the corresponding directory. Such paths will
355 * later be processed in process_df_entry() at the end. If
356 * the corresponding directory ends up being removed by the
357 * merge, then the file will be reinstated at that time
358 * (albeit with a different timestamp!); otherwise, if the
359 * file is not supposed to be removed by the merge, the
360 * contents of the file will be placed in another unique
361 * filename.
362 *
363 * NOTE: This function relies on the fact that entries for a
364 * D/F conflict will appear adjacent in the index, with the
365 * entries for the file appearing before entries for paths
366 * below the corresponding directory.
367 */
368 const char *last_file = NULL;
369 int last_len = 0;
370 struct stage_data *last_e;
371 int i;
372 /*
374 * Do not do any of this crazyness during the recursive; we don't
375 * even write anything to the working tree!
376 */
377 if (o->call_depth)
378 return;
379 for (i = 0; i < entries->nr; i++) {
381 const char *path = entries->items[i].string;
382 int len = strlen(path);
383 struct stage_data *e = entries->items[i].util;
384 /*
386 * Check if last_file & path correspond to a D/F conflict;
387 * i.e. whether path is last_file+'/'+<something>.
388 * If so, remove last_file to make room for path and friends.
389 */
390 if (last_file &&
391 len > last_len &&
392 memcmp(path, last_file, last_len) == 0 &&
393 path[last_len] == '/') {
394 output(o, 3, "Removing %s to make room for subdirectory; may re-add later.", last_file);
395 unlink(last_file);
396 }
397 /*
399 * Determine whether path could exist as a file in the
400 * working directory as a possible D/F conflict. This
401 * will only occur when it exists in stage 2 as a
402 * file.
403 */
404 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
405 last_file = path;
406 last_len = len;
407 last_e = e;
408 } else {
409 last_file = NULL;
410 }
411 }
412}
413struct rename
415{
416 struct diff_filepair *pair;
417 struct stage_data *src_entry;
418 struct stage_data *dst_entry;
419 unsigned processed:1;
420};
421/*
423 * Get information of all renames which occurred between 'o_tree' and
424 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
425 * 'b_tree') to be able to associate the correct cache entries with
426 * the rename information. 'tree' is always equal to either a_tree or b_tree.
427 */
428static struct string_list *get_renames(struct merge_options *o,
429 struct tree *tree,
430 struct tree *o_tree,
431 struct tree *a_tree,
432 struct tree *b_tree,
433 struct string_list *entries)
434{
435 int i;
436 struct string_list *renames;
437 struct diff_options opts;
438 renames = xcalloc(1, sizeof(struct string_list));
440 diff_setup(&opts);
441 DIFF_OPT_SET(&opts, RECURSIVE);
442 opts.detect_rename = DIFF_DETECT_RENAME;
443 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
444 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
445 500;
446 opts.warn_on_too_large_rename = 1;
447 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
448 if (diff_setup_done(&opts) < 0)
449 die("diff setup failed");
450 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
451 diffcore_std(&opts);
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 char *base_name, *name1, *name2;
745 int merge_status;
746 int favor;
747 if (o->call_depth)
749 favor = 0;
750 else {
751 switch (o->recursive_variant) {
752 case MERGE_RECURSIVE_OURS:
753 favor = XDL_MERGE_FAVOR_OURS;
754 break;
755 case MERGE_RECURSIVE_THEIRS:
756 favor = XDL_MERGE_FAVOR_THEIRS;
757 break;
758 default:
759 favor = 0;
760 break;
761 }
762 }
763 if (strcmp(a->path, b->path) ||
765 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
766 base_name = o->ancestor == NULL ? NULL :
767 xstrdup(mkpath("%s:%s", o->ancestor, one->path));
768 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
769 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
770 } else {
771 base_name = o->ancestor == NULL ? NULL :
772 xstrdup(mkpath("%s", o->ancestor));
773 name1 = xstrdup(mkpath("%s", branch1));
774 name2 = xstrdup(mkpath("%s", branch2));
775 }
776 read_mmblob(&orig, one->sha1);
778 read_mmblob(&src1, a->sha1);
779 read_mmblob(&src2, b->sha1);
780 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
782 &src1, name1, &src2, name2,
783 ((o->call_depth ? LL_OPT_VIRTUAL_ANCESTOR : 0) |
784 (o->renormalize ? LL_OPT_RENORMALIZE : 0) |
785 create_ll_flag(favor)));
786 free(name1);
788 free(name2);
789 free(orig.ptr);
790 free(src1.ptr);
791 free(src2.ptr);
792 return merge_status;
793}
794static struct merge_file_info merge_file(struct merge_options *o,
796 struct diff_filespec *one,
797 struct diff_filespec *a,
798 struct diff_filespec *b,
799 const char *branch1,
800 const char *branch2)
801{
802 struct merge_file_info result;
803 result.merge = 0;
804 result.clean = 1;
805 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
807 result.clean = 0;
808 if (S_ISREG(a->mode)) {
809 result.mode = a->mode;
810 hashcpy(result.sha, a->sha1);
811 } else {
812 result.mode = b->mode;
813 hashcpy(result.sha, b->sha1);
814 }
815 } else {
816 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
817 result.merge = 1;
818 /*
820 * Merge modes
821 */
822 if (a->mode == b->mode || a->mode == one->mode)
823 result.mode = b->mode;
824 else {
825 result.mode = a->mode;
826 if (b->mode != one->mode) {
827 result.clean = 0;
828 result.merge = 1;
829 }
830 }
831 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
833 hashcpy(result.sha, b->sha1);
834 else if (sha_eq(b->sha1, one->sha1))
835 hashcpy(result.sha, a->sha1);
836 else if (S_ISREG(a->mode)) {
837 mmbuffer_t result_buf;
838 int merge_status;
839 merge_status = merge_3way(o, &result_buf, one, a, b,
841 branch1, branch2);
842 if ((merge_status < 0) || !result_buf.ptr)
844 die("Failed to execute internal merge");
845 if (write_sha1_file(result_buf.ptr, result_buf.size,
847 blob_type, result.sha))
848 die("Unable to add %s to database",
849 a->path);
850 free(result_buf.ptr);
852 result.clean = (merge_status == 0);
853 } else if (S_ISGITLINK(a->mode)) {
854 result.clean = merge_submodule(result.sha, one->path, one->sha1,
855 a->sha1, b->sha1);
856 } else if (S_ISLNK(a->mode)) {
857 hashcpy(result.sha, a->sha1);
858 if (!sha_eq(a->sha1, b->sha1))
860 result.clean = 0;
861 } else {
862 die("unsupported object type in the tree");
863 }
864 }
865 return result;
867}
868static void conflict_rename_delete(struct merge_options *o,
870 struct diff_filepair *pair,
871 const char *rename_branch,
872 const char *other_branch)
873{
874 char *dest_name = pair->two->path;
875 int df_conflict = 0;
876 struct stat st;
877 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
879 "and deleted in %s",
880 pair->one->path, pair->two->path, rename_branch,
881 other_branch);
882 if (!o->call_depth)
883 update_stages(dest_name, NULL,
884 rename_branch == o->branch1 ? pair->two : NULL,
885 rename_branch == o->branch1 ? NULL : pair->two,
886 1);
887 if (lstat(dest_name, &st) == 0 && S_ISDIR(st.st_mode)) {
888 dest_name = unique_path(o, dest_name, rename_branch);
889 df_conflict = 1;
890 }
891 update_file(o, 0, pair->two->sha1, pair->two->mode, dest_name);
892 if (df_conflict)
893 free(dest_name);
894}
895static void conflict_rename_rename_1to2(struct merge_options *o,
897 struct diff_filepair *pair1,
898 const char *branch1,
899 struct diff_filepair *pair2,
900 const char *branch2)
901{
902 /* One file was renamed in both branches, but to different names. */
903 char *del[2];
904 int delp = 0;
905 const char *ren1_dst = pair1->two->path;
906 const char *ren2_dst = pair2->two->path;
907 const char *dst_name1 = ren1_dst;
908 const char *dst_name2 = ren2_dst;
909 struct stat st;
910 if (lstat(ren1_dst, &st) == 0 && S_ISDIR(st.st_mode)) {
911 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
912 output(o, 1, "%s is a directory in %s adding as %s instead",
913 ren1_dst, branch2, dst_name1);
914 }
915 if (lstat(ren2_dst, &st) == 0 && S_ISDIR(st.st_mode)) {
916 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
917 output(o, 1, "%s is a directory in %s adding as %s instead",
918 ren2_dst, branch1, dst_name2);
919 }
920 if (o->call_depth) {
921 remove_file_from_cache(dst_name1);
922 remove_file_from_cache(dst_name2);
923 /*
924 * Uncomment to leave the conflicting names in the resulting tree
925 *
926 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
927 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
928 */
929 } else {
930 update_stages(ren1_dst, NULL, pair1->two, NULL, 1);
931 update_stages(ren2_dst, NULL, NULL, pair2->two, 1);
932 update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
934 update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
935 }
936 while (delp--)
937 free(del[delp]);
938}
939static void conflict_rename_rename_2to1(struct merge_options *o,
941 struct rename *ren1,
942 const char *branch1,
943 struct rename *ren2,
944 const char *branch2)
945{
946 /* Two files were renamed to the same thing. */
947 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
948 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
949 output(o, 1, "Renaming %s to %s and %s to %s instead",
950 ren1->pair->one->path, new_path1,
951 ren2->pair->one->path, new_path2);
952 remove_file(o, 0, ren1->pair->two->path, 0);
953 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
954 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
955 free(new_path2);
956 free(new_path1);
957}
958static int process_renames(struct merge_options *o,
960 struct string_list *a_renames,
961 struct string_list *b_renames)
962{
963 int clean_merge = 1, i, j;
964 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
965 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
966 const struct rename *sre;
967 for (i = 0; i < a_renames->nr; i++) {
969 sre = a_renames->items[i].util;
970 string_list_insert(&a_by_dst, sre->pair->two->path)->util
971 = sre->dst_entry;
972 }
973 for (i = 0; i < b_renames->nr; i++) {
974 sre = b_renames->items[i].util;
975 string_list_insert(&b_by_dst, sre->pair->two->path)->util
976 = sre->dst_entry;
977 }
978 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
980 char *src;
981 struct string_list *renames1, *renames2Dst;
982 struct rename *ren1 = NULL, *ren2 = NULL;
983 const char *branch1, *branch2;
984 const char *ren1_src, *ren1_dst;
985 if (i >= a_renames->nr) {
987 ren2 = b_renames->items[j++].util;
988 } else if (j >= b_renames->nr) {
989 ren1 = a_renames->items[i++].util;
990 } else {
991 int compare = strcmp(a_renames->items[i].string,
992 b_renames->items[j].string);
993 if (compare <= 0)
994 ren1 = a_renames->items[i++].util;
995 if (compare >= 0)
996 ren2 = b_renames->items[j++].util;
997 }
998 /* TODO: refactor, so that 1/2 are not needed */
1000 if (ren1) {
1001 renames1 = a_renames;
1002 renames2Dst = &b_by_dst;
1003 branch1 = o->branch1;
1004 branch2 = o->branch2;
1005 } else {
1006 struct rename *tmp;
1007 renames1 = b_renames;
1008 renames2Dst = &a_by_dst;
1009 branch1 = o->branch2;
1010 branch2 = o->branch1;
1011 tmp = ren2;
1012 ren2 = ren1;
1013 ren1 = tmp;
1014 }
1015 src = ren1->pair->one->path;
1016 ren1->dst_entry->processed = 1;
1018 ren1->src_entry->processed = 1;
1019 if (ren1->processed)
1021 continue;
1022 ren1->processed = 1;
1023 ren1_src = ren1->pair->one->path;
1025 ren1_dst = ren1->pair->two->path;
1026 if (ren2) {
1028 const char *ren2_src = ren2->pair->one->path;
1029 const char *ren2_dst = ren2->pair->two->path;
1030 /* Renamed in 1 and renamed in 2 */
1031 if (strcmp(ren1_src, ren2_src) != 0)
1032 die("ren1.src != ren2.src");
1033 ren2->dst_entry->processed = 1;
1034 ren2->processed = 1;
1035 if (strcmp(ren1_dst, ren2_dst) != 0) {
1036 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO,
1037 ren1->pair,
1038 ren2->pair,
1039 branch1,
1040 branch2,
1041 ren1->dst_entry,
1042 ren2->dst_entry);
1043 } else {
1044 remove_file(o, 1, ren1_src, 1);
1045 update_stages_and_entry(ren1_dst,
1046 ren1->dst_entry,
1047 ren1->pair->one,
1048 ren1->pair->two,
1049 ren2->pair->two,
1050 1 /* clear */);
1051 }
1052 } else {
1053 /* Renamed in 1, maybe changed in 2 */
1054 struct string_list_item *item;
1055 /* we only use sha1 and mode of these */
1056 struct diff_filespec src_other, dst_other;
1057 int try_merge;
1058 /*
1060 * unpack_trees loads entries from common-commit
1061 * into stage 1, from head-commit into stage 2, and
1062 * from merge-commit into stage 3. We keep track
1063 * of which side corresponds to the rename.
1064 */
1065 int renamed_stage = a_renames == renames1 ? 2 : 3;
1066 int other_stage = a_renames == renames1 ? 3 : 2;
1067 remove_file(o, 1, ren1_src, o->call_depth || renamed_stage == 2);
1069 hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
1071 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1072 hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
1073 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1074 try_merge = 0;
1075 if (sha_eq(src_other.sha1, null_sha1)) {
1077 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
1078 ren1->dst_entry->processed = 0;
1079 setup_rename_df_conflict_info(RENAME_DELETE,
1080 ren1->pair,
1081 NULL,
1082 branch1,
1083 branch2,
1084 ren1->dst_entry,
1085 NULL);
1086 } else {
1087 clean_merge = 0;
1088 conflict_rename_delete(o, ren1->pair, branch1, branch2);
1089 }
1090 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1091 sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
1092 /* Added file on the other side
1093 identical to the file being
1094 renamed: clean merge */
1095 update_file(o, 1, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
1096 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
1097 const char *new_path;
1098 clean_merge = 0;
1099 try_merge = 1;
1100 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1101 "%s added in %s",
1102 ren1_src, ren1_dst, branch1,
1103 ren1_dst, branch2);
1104 if (o->call_depth) {
1105 struct merge_file_info mfi;
1106 struct diff_filespec one, a, b;
1107 one.path = a.path = b.path =
1109 (char *)ren1_dst;
1110 hashcpy(one.sha1, null_sha1);
1111 one.mode = 0;
1112 hashcpy(a.sha1, ren1->pair->two->sha1);
1113 a.mode = ren1->pair->two->mode;
1114 hashcpy(b.sha1, dst_other.sha1);
1115 b.mode = dst_other.mode;
1116 mfi = merge_file(o, &one, &a, &b,
1117 branch1,
1118 branch2);
1119 output(o, 1, "Adding merged %s", ren1_dst);
1120 update_file(o, 0,
1121 mfi.sha,
1122 mfi.mode,
1123 ren1_dst);
1124 try_merge = 0;
1125 } else {
1126 new_path = unique_path(o, ren1_dst, branch2);
1127 output(o, 1, "Adding as %s instead", new_path);
1128 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1129 }
1130 } else if ((item = string_list_lookup(renames2Dst, ren1_dst))) {
1131 ren2 = item->util;
1132 clean_merge = 0;
1133 ren2->processed = 1;
1134 output(o, 1, "CONFLICT (rename/rename): "
1135 "Rename %s->%s in %s. "
1136 "Rename %s->%s in %s",
1137 ren1_src, ren1_dst, branch1,
1138 ren2->pair->one->path, ren2->pair->two->path, branch2);
1139 conflict_rename_rename_2to1(o, ren1, branch1, ren2, branch2);
1140 } else
1141 try_merge = 1;
1142 if (try_merge) {
1144 struct diff_filespec *one, *a, *b;
1145 src_other.path = (char *)ren1_src;
1146 one = ren1->pair->one;
1148 if (a_renames == renames1) {
1149 a = ren1->pair->two;
1150 b = &src_other;
1151 } else {
1152 b = ren1->pair->two;
1153 a = &src_other;
1154 }
1155 update_stages_and_entry(ren1_dst, ren1->dst_entry, one, a, b, 1);
1156 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
1157 setup_rename_df_conflict_info(RENAME_NORMAL,
1158 ren1->pair,
1159 NULL,
1160 branch1,
1161 NULL,
1162 ren1->dst_entry,
1163 NULL);
1164 }
1165 }
1166 }
1167 }
1168 string_list_clear(&a_by_dst, 0);
1169 string_list_clear(&b_by_dst, 0);
1170 return clean_merge;
1172}
1173static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1175{
1176 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1177}
1178static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1180{
1181 void *buf;
1182 enum object_type type;
1183 unsigned long size;
1184 buf = read_sha1_file(sha1, &type, &size);
1185 if (!buf)
1186 return error("cannot read object %s", sha1_to_hex(sha1));
1187 if (type != OBJ_BLOB) {
1188 free(buf);
1189 return error("object %s is not a blob", sha1_to_hex(sha1));
1190 }
1191 strbuf_attach(dst, buf, size, size + 1);
1192 return 0;
1193}
1194static int blob_unchanged(const unsigned char *o_sha,
1196 const unsigned char *a_sha,
1197 int renormalize, const char *path)
1198{
1199 struct strbuf o = STRBUF_INIT;
1200 struct strbuf a = STRBUF_INIT;
1201 int ret = 0; /* assume changed for safety */
1202 if (sha_eq(o_sha, a_sha))
1204 return 1;
1205 if (!renormalize)
1206 return 0;
1207 assert(o_sha && a_sha);
1209 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1210 goto error_return;
1211 /*
1212 * Note: binary | is used so that both renormalizations are
1213 * performed. Comparison can be skipped if both files are
1214 * unchanged since their sha1s have already been compared.
1215 */
1216 if (renormalize_buffer(path, o.buf, o.len, &o) |
1217 renormalize_buffer(path, a.buf, o.len, &a))
1218 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1219error_return:
1221 strbuf_release(&o);
1222 strbuf_release(&a);
1223 return ret;
1224}
1225static void handle_delete_modify(struct merge_options *o,
1227 const char *path,
1228 const char *new_path,
1229 unsigned char *a_sha, int a_mode,
1230 unsigned char *b_sha, int b_mode)
1231{
1232 if (!a_sha) {
1233 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1234 "and modified in %s. Version %s of %s left in tree%s%s.",
1235 path, o->branch1,
1236 o->branch2, o->branch2, path,
1237 path == new_path ? "" : " at ",
1238 path == new_path ? "" : new_path);
1239 update_file(o, 0, b_sha, b_mode, new_path);
1240 } else {
1241 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1242 "and modified in %s. Version %s of %s left in tree%s%s.",
1243 path, o->branch2,
1244 o->branch1, o->branch1, path,
1245 path == new_path ? "" : " at ",
1246 path == new_path ? "" : new_path);
1247 update_file(o, 0, a_sha, a_mode, new_path);
1248 }
1249}
1250static int merge_content(struct merge_options *o,
1252 const char *path,
1253 unsigned char *o_sha, int o_mode,
1254 unsigned char *a_sha, int a_mode,
1255 unsigned char *b_sha, int b_mode,
1256 const char *df_rename_conflict_branch)
1257{
1258 const char *reason = "content";
1259 struct merge_file_info mfi;
1260 struct diff_filespec one, a, b;
1261 struct stat st;
1262 unsigned df_conflict_remains = 0;
1263 if (!o_sha) {
1265 reason = "add/add";
1266 o_sha = (unsigned char *)null_sha1;
1267 }
1268 one.path = a.path = b.path = (char *)path;
1269 hashcpy(one.sha1, o_sha);
1270 one.mode = o_mode;
1271 hashcpy(a.sha1, a_sha);
1272 a.mode = a_mode;
1273 hashcpy(b.sha1, b_sha);
1274 b.mode = b_mode;
1275 mfi = merge_file(o, &one, &a, &b, o->branch1, o->branch2);
1277 if (df_rename_conflict_branch &&
1278 lstat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
1279 df_conflict_remains = 1;
1280 }
1281 if (mfi.clean && !df_conflict_remains &&
1283 sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode &&
1284 !o->call_depth && !lstat(path, &st)) {
1285 output(o, 3, "Skipped %s (merged same as existing)", path);
1286 add_cacheinfo(mfi.mode, mfi.sha, path,
1287 0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
1288 return mfi.clean;
1289 } else
1290 output(o, 2, "Auto-merging %s", path);
1291 if (!mfi.clean) {
1293 if (S_ISGITLINK(mfi.mode))
1294 reason = "submodule";
1295 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
1296 reason, path);
1297 }
1298 if (df_conflict_remains) {
1300 const char *new_path;
1301 update_file_flags(o, mfi.sha, mfi.mode, path,
1302 o->call_depth || mfi.clean, 0);
1303 new_path = unique_path(o, path, df_rename_conflict_branch);
1304 mfi.clean = 0;
1305 output(o, 1, "Adding as %s instead", new_path);
1306 update_file_flags(o, mfi.sha, mfi.mode, new_path, 0, 1);
1307 } else {
1308 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1309 }
1310 return mfi.clean;
1311}
1313/* Per entry merge function */
1315static int process_entry(struct merge_options *o,
1316 const char *path, struct stage_data *entry)
1317{
1318 /*
1319 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1320 print_index_entry("\tpath: ", entry);
1321 */
1322 int clean_merge = 1;
1323 int normalize = o->renormalize;
1324 unsigned o_mode = entry->stages[1].mode;
1325 unsigned a_mode = entry->stages[2].mode;
1326 unsigned b_mode = entry->stages[3].mode;
1327 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1328 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1329 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1330 if (entry->rename_df_conflict_info)
1332 return 1; /* Such cases are handled elsewhere. */
1333 entry->processed = 1;
1335 if (o_sha && (!a_sha || !b_sha)) {
1336 /* Case A: Deleted in one */
1337 if ((!a_sha && !b_sha) ||
1338 (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) ||
1339 (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) {
1340 /* Deleted in both or deleted in one and
1341 * unchanged in the other */
1342 if (a_sha)
1343 output(o, 2, "Removing %s", path);
1344 /* do not touch working file if it did not exist */
1345 remove_file(o, 1, path, !a_sha);
1346 } else if (string_list_has_string(&o->current_directory_set,
1347 path)) {
1348 entry->processed = 0;
1349 return 1; /* Assume clean until processed */
1350 } else {
1351 /* Deleted in one and changed in the other */
1352 clean_merge = 0;
1353 handle_delete_modify(o, path, path,
1354 a_sha, a_mode, b_sha, b_mode);
1355 }
1356 } else if ((!o_sha && a_sha && !b_sha) ||
1358 (!o_sha && !a_sha && b_sha)) {
1359 /* Case B: Added in one. */
1360 unsigned mode;
1361 const unsigned char *sha;
1362 if (a_sha) {
1364 mode = a_mode;
1365 sha = a_sha;
1366 } else {
1367 mode = b_mode;
1368 sha = b_sha;
1369 }
1370 if (string_list_has_string(&o->current_directory_set, path)) {
1371 /* Handle D->F conflicts after all subfiles */
1372 entry->processed = 0;
1373 return 1; /* Assume clean until processed */
1374 } else {
1375 output(o, 2, "Adding %s", path);
1376 update_file(o, 1, sha, mode, path);
1377 }
1378 } else if (a_sha && b_sha) {
1379 /* Case C: Added in both (check for same permissions) and */
1380 /* case D: Modified in both, but differently. */
1381 clean_merge = merge_content(o, path,
1382 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1383 NULL);
1384 } else if (!o_sha && !a_sha && !b_sha) {
1385 /*
1386 * this entry was deleted altogether. a_mode == 0 means
1387 * we had that path and want to actively remove it.
1388 */
1389 remove_file(o, 1, path, !a_mode);
1390 } else
1391 die("Fatal merge failure, shouldn't happen.");
1392 return clean_merge;
1394}
1395/*
1397 * Per entry merge function for D/F (and/or rename) conflicts. In the
1398 * cases we can cleanly resolve D/F conflicts, process_entry() can
1399 * clean out all the files below the directory for us. All D/F
1400 * conflict cases must be handled here at the end to make sure any
1401 * directories that can be cleaned out, are.
1402 *
1403 * Some rename conflicts may also be handled here that don't necessarily
1404 * involve D/F conflicts, since the code to handle them is generic enough
1405 * to handle those rename conflicts with or without D/F conflicts also
1406 * being involved.
1407 */
1408static int process_df_entry(struct merge_options *o,
1409 const char *path, struct stage_data *entry)
1410{
1411 int clean_merge = 1;
1412 unsigned o_mode = entry->stages[1].mode;
1413 unsigned a_mode = entry->stages[2].mode;
1414 unsigned b_mode = entry->stages[3].mode;
1415 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1416 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1417 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1418 struct stat st;
1419 entry->processed = 1;
1421 if (entry->rename_df_conflict_info) {
1422 struct rename_df_conflict_info *conflict_info = entry->rename_df_conflict_info;
1423 char *src;
1424 switch (conflict_info->rename_type) {
1425 case RENAME_NORMAL:
1426 clean_merge = merge_content(o, path,
1427 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1428 conflict_info->branch1);
1429 break;
1430 case RENAME_DELETE:
1431 clean_merge = 0;
1432 conflict_rename_delete(o, conflict_info->pair1,
1433 conflict_info->branch1,
1434 conflict_info->branch2);
1435 break;
1436 case RENAME_ONE_FILE_TO_TWO:
1437 src = conflict_info->pair1->one->path;
1438 clean_merge = 0;
1439 output(o, 1, "CONFLICT (rename/rename): "
1440 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1441 "rename \"%s\"->\"%s\" in \"%s\"%s",
1442 src, conflict_info->pair1->two->path, conflict_info->branch1,
1443 src, conflict_info->pair2->two->path, conflict_info->branch2,
1444 o->call_depth ? " (left unresolved)" : "");
1445 if (o->call_depth) {
1446 remove_file_from_cache(src);
1447 update_file(o, 0, conflict_info->pair1->one->sha1,
1448 conflict_info->pair1->one->mode, src);
1449 }
1450 conflict_rename_rename_1to2(o, conflict_info->pair1,
1451 conflict_info->branch1,
1452 conflict_info->pair2,
1453 conflict_info->branch2);
1454 conflict_info->dst_entry2->processed = 1;
1455 break;
1456 default:
1457 entry->processed = 0;
1458 break;
1459 }
1460 } else if (o_sha && (!a_sha || !b_sha)) {
1461 /* Modify/delete; deleted side may have put a directory in the way */
1462 const char *new_path = path;
1463 if (lstat(path, &st) == 0 && S_ISDIR(st.st_mode))
1464 new_path = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1465 clean_merge = 0;
1466 handle_delete_modify(o, path, new_path,
1467 a_sha, a_mode, b_sha, b_mode);
1468 } else if (!o_sha && !!a_sha != !!b_sha) {
1469 /* directory -> (directory, file) */
1470 const char *add_branch;
1471 const char *other_branch;
1472 unsigned mode;
1473 const unsigned char *sha;
1474 const char *conf;
1475 if (a_sha) {
1477 add_branch = o->branch1;
1478 other_branch = o->branch2;
1479 mode = a_mode;
1480 sha = a_sha;
1481 conf = "file/directory";
1482 } else {
1483 add_branch = o->branch2;
1484 other_branch = o->branch1;
1485 mode = b_mode;
1486 sha = b_sha;
1487 conf = "directory/file";
1488 }
1489 if (lstat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
1490 const char *new_path = unique_path(o, path, add_branch);
1491 clean_merge = 0;
1492 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1493 "Adding %s as %s",
1494 conf, path, other_branch, path, new_path);
1495 update_file(o, 0, sha, mode, new_path);
1496 } else {
1497 output(o, 2, "Adding %s", path);
1498 update_file(o, 1, sha, mode, path);
1499 }
1500 } else {
1501 entry->processed = 0;
1502 return 1; /* not handled; assume clean until processed */
1503 }
1504 return clean_merge;
1506}
1507int merge_trees(struct merge_options *o,
1509 struct tree *head,
1510 struct tree *merge,
1511 struct tree *common,
1512 struct tree **result)
1513{
1514 int code, clean;
1515 if (o->subtree_shift) {
1517 merge = shift_tree_object(head, merge, o->subtree_shift);
1518 common = shift_tree_object(head, common, o->subtree_shift);
1519 }
1520 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1522 output(o, 0, "Already up-to-date!");
1523 *result = head;
1524 return 1;
1525 }
1526 code = git_merge_trees(o->call_depth, common, head, merge);
1528 if (code != 0) {
1530 if (show(o, 4) || o->call_depth)
1531 die("merging of trees %s and %s failed",
1532 sha1_to_hex(head->object.sha1),
1533 sha1_to_hex(merge->object.sha1));
1534 else
1535 exit(128);
1536 }
1537 if (unmerged_cache()) {
1539 struct string_list *entries, *re_head, *re_merge;
1540 int i;
1541 string_list_clear(&o->current_file_set, 1);
1542 string_list_clear(&o->current_directory_set, 1);
1543 get_files_dirs(o, head);
1544 get_files_dirs(o, merge);
1545 entries = get_unmerged();
1547 make_room_for_directories_of_df_conflicts(o, entries);
1548 re_head = get_renames(o, head, common, head, merge, entries);
1549 re_merge = get_renames(o, merge, common, head, merge, entries);
1550 clean = process_renames(o, re_head, re_merge);
1551 for (i = 0; i < entries->nr; i++) {
1552 const char *path = entries->items[i].string;
1553 struct stage_data *e = entries->items[i].util;
1554 if (!e->processed
1555 && !process_entry(o, path, e))
1556 clean = 0;
1557 }
1558 for (i = 0; i < entries->nr; i++) {
1559 const char *path = entries->items[i].string;
1560 struct stage_data *e = entries->items[i].util;
1561 if (!e->processed
1562 && !process_df_entry(o, path, e))
1563 clean = 0;
1564 }
1565 for (i = 0; i < entries->nr; i++) {
1566 struct stage_data *e = entries->items[i].util;
1567 if (!e->processed)
1568 die("Unprocessed path??? %s",
1569 entries->items[i].string);
1570 }
1571 string_list_clear(re_merge, 0);
1573 string_list_clear(re_head, 0);
1574 string_list_clear(entries, 1);
1575 }
1577 else
1578 clean = 1;
1579 if (o->call_depth)
1581 *result = write_tree_from_memory(o);
1582 return clean;
1584}
1585static struct commit_list *reverse_commit_list(struct commit_list *list)
1587{
1588 struct commit_list *next = NULL, *current, *backup;
1589 for (current = list; current; current = backup) {
1590 backup = current->next;
1591 current->next = next;
1592 next = current;
1593 }
1594 return next;
1595}
1596/*
1598 * Merge the commits h1 and h2, return the resulting virtual
1599 * commit object and a flag indicating the cleanness of the merge.
1600 */
1601int merge_recursive(struct merge_options *o,
1602 struct commit *h1,
1603 struct commit *h2,
1604 struct commit_list *ca,
1605 struct commit **result)
1606{
1607 struct commit_list *iter;
1608 struct commit *merged_common_ancestors;
1609 struct tree *mrtree = mrtree;
1610 int clean;
1611 if (show(o, 4)) {
1613 output(o, 4, "Merging:");
1614 output_commit_title(o, h1);
1615 output_commit_title(o, h2);
1616 }
1617 if (!ca) {
1619 ca = get_merge_bases(h1, h2, 1);
1620 ca = reverse_commit_list(ca);
1621 }
1622 if (show(o, 5)) {
1624 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
1625 for (iter = ca; iter; iter = iter->next)
1626 output_commit_title(o, iter->item);
1627 }
1628 merged_common_ancestors = pop_commit(&ca);
1630 if (merged_common_ancestors == NULL) {
1631 /* if there is no common ancestor, make an empty tree */
1632 struct tree *tree = xcalloc(1, sizeof(struct tree));
1633 tree->object.parsed = 1;
1635 tree->object.type = OBJ_TREE;
1636 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1637 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1638 }
1639 for (iter = ca; iter; iter = iter->next) {
1641 const char *saved_b1, *saved_b2;
1642 o->call_depth++;
1643 /*
1644 * When the merge fails, the result contains files
1645 * with conflict markers. The cleanness flag is
1646 * ignored, it was never actually used, as result of
1647 * merge_trees has always overwritten it: the committed
1648 * "conflicts" were already resolved.
1649 */
1650 discard_cache();
1651 saved_b1 = o->branch1;
1652 saved_b2 = o->branch2;
1653 o->branch1 = "Temporary merge branch 1";
1654 o->branch2 = "Temporary merge branch 2";
1655 merge_recursive(o, merged_common_ancestors, iter->item,
1656 NULL, &merged_common_ancestors);
1657 o->branch1 = saved_b1;
1658 o->branch2 = saved_b2;
1659 o->call_depth--;
1660 if (!merged_common_ancestors)
1662 die("merge returned no commit");
1663 }
1664 discard_cache();
1666 if (!o->call_depth)
1667 read_cache();
1668 o->ancestor = "merged common ancestors";
1670 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1671 &mrtree);
1672 if (o->call_depth) {
1674 *result = make_virtual_commit(mrtree, "merged tree");
1675 commit_list_insert(h1, &(*result)->parents);
1676 commit_list_insert(h2, &(*result)->parents->next);
1677 }
1678 flush_output(o);
1679 return clean;
1680}
1681static struct commit *get_ref(const unsigned char *sha1, const char *name)
1683{
1684 struct object *object;
1685 object = deref_tag(parse_object(sha1), name, strlen(name));
1687 if (!object)
1688 return NULL;
1689 if (object->type == OBJ_TREE)
1690 return make_virtual_commit((struct tree*)object, name);
1691 if (object->type != OBJ_COMMIT)
1692 return NULL;
1693 if (parse_commit((struct commit *)object))
1694 return NULL;
1695 return (struct commit *)object;
1696}
1697int merge_recursive_generic(struct merge_options *o,
1699 const unsigned char *head,
1700 const unsigned char *merge,
1701 int num_base_list,
1702 const unsigned char **base_list,
1703 struct commit **result)
1704{
1705 int clean, index_fd;
1706 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1707 struct commit *head_commit = get_ref(head, o->branch1);
1708 struct commit *next_commit = get_ref(merge, o->branch2);
1709 struct commit_list *ca = NULL;
1710 if (base_list) {
1712 int i;
1713 for (i = 0; i < num_base_list; ++i) {
1714 struct commit *base;
1715 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1716 return error("Could not parse object '%s'",
1717 sha1_to_hex(base_list[i]));
1718 commit_list_insert(base, &ca);
1719 }
1720 }
1721 index_fd = hold_locked_index(lock, 1);
1723 clean = merge_recursive(o, head_commit, next_commit, ca,
1724 result);
1725 if (active_cache_changed &&
1726 (write_cache(index_fd, active_cache, active_nr) ||
1727 commit_locked_index(lock)))
1728 return error("Unable to write index.");
1729 return clean ? 0 : 1;
1731}
1732static int merge_recursive_config(const char *var, const char *value, void *cb)
1734{
1735 struct merge_options *o = cb;
1736 if (!strcasecmp(var, "merge.verbosity")) {
1737 o->verbosity = git_config_int(var, value);
1738 return 0;
1739 }
1740 if (!strcasecmp(var, "diff.renamelimit")) {
1741 o->diff_rename_limit = git_config_int(var, value);
1742 return 0;
1743 }
1744 if (!strcasecmp(var, "merge.renamelimit")) {
1745 o->merge_rename_limit = git_config_int(var, value);
1746 return 0;
1747 }
1748 return git_xmerge_config(var, value, cb);
1749}
1750void init_merge_options(struct merge_options *o)
1752{
1753 memset(o, 0, sizeof(struct merge_options));
1754 o->verbosity = 2;
1755 o->buffer_output = 1;
1756 o->diff_rename_limit = -1;
1757 o->merge_rename_limit = -1;
1758 o->renormalize = 0;
1759 git_config(merge_recursive_config, o);
1760 if (getenv("GIT_MERGE_VERBOSITY"))
1761 o->verbosity =
1762 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1763 if (o->verbosity >= 5)
1764 o->buffer_output = 0;
1765 strbuf_init(&o->obuf, 0);
1766 memset(&o->current_file_set, 0, sizeof(struct string_list));
1767 o->current_file_set.strdup_strings = 1;
1768 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1769 o->current_directory_set.strdup_strings = 1;
1770}