2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
8 #include "cache-tree.h"
12 #include "tree-walk.h"
16 #include "unpack-trees.h"
17 #include "string-list.h"
18 #include "xdiff-interface.h"
21 #include "merge-recursive.h"
24 static struct tree *shift_tree_object(struct tree *one, struct tree *two)
26 unsigned char shifted[20];
29 * NEEDSWORK: this limits the recursion depth to hardcoded
30 * value '2' to avoid excessive overhead.
32 shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
33 if (!hashcmp(two->object.sha1, shifted))
35 return lookup_tree(shifted);
39 * A virtual commit has (const char *)commit->util set to the name.
42 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
44 struct commit *commit = xcalloc(1, sizeof(struct commit));
46 commit->util = (void*)comment;
48 commit->object.parsed = 1;
53 * Since we use get_tree_entry(), which does not put the read object into
54 * the object pool, we cannot rely on a == b.
56 static int sha_eq(const unsigned char *a, const unsigned char *b)
60 return a && b && hashcmp(a, b) == 0;
64 * Since we want to write the index eventually, we cannot reuse the index
65 * for these (temporary) data.
72 unsigned char sha[20];
77 static int show(struct merge_options *o, int v)
79 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
82 static void flush_output(struct merge_options *o)
85 fputs(o->obuf.buf, stdout);
86 strbuf_reset(&o->obuf);
90 __attribute__((format (printf, 3, 4)))
91 static void output(struct merge_options *o, int v, const char *fmt, ...)
99 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
100 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
101 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
104 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
109 if (len >= strbuf_avail(&o->obuf)) {
110 strbuf_grow(&o->obuf, len + 2);
112 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
114 if (len >= strbuf_avail(&o->obuf)) {
115 die("this should not happen, your snprintf is broken");
118 strbuf_setlen(&o->obuf, o->obuf.len + len);
119 strbuf_add(&o->obuf, "\n", 1);
120 if (!o->buffer_output)
124 static void output_commit_title(struct merge_options *o, struct commit *commit)
128 for (i = o->call_depth; i--;)
131 printf("virtual %s\n", (char *)commit->util);
133 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
134 if (parse_commit(commit) != 0)
135 printf("(bad commit)\n");
139 for (s = commit->buffer; *s; s++)
140 if (*s == '\n' && s[1] == '\n') {
144 for (len = 0; s[len] && '\n' != s[len]; len++)
146 printf("%.*s\n", len, s);
151 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
152 const char *path, int stage, int refresh, int options)
154 struct cache_entry *ce;
155 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
157 return error("addinfo_cache failed for path '%s'", path);
158 return add_cache_entry(ce, options);
161 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
164 init_tree_desc(desc, tree->buffer, tree->size);
167 static int git_merge_trees(int index_only,
173 struct tree_desc t[3];
174 struct unpack_trees_options opts;
175 struct unpack_trees_error_msgs msgs = {
176 /* would_overwrite */
177 "Your local changes to '%s' would be overwritten by merge. Aborting.",
178 /* not_uptodate_file */
179 "Your local changes to '%s' would be overwritten by merge. Aborting.",
180 /* not_uptodate_dir */
181 "Updating '%s' would lose untracked files in it. Aborting.",
182 /* would_lose_untracked */
183 "Untracked working tree file '%s' would be %s by merge. Aborting",
184 /* bind_overlap -- will not happen here */
187 if (advice_commit_before_merge) {
188 msgs.would_overwrite = msgs.not_uptodate_file =
189 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
190 "Please, commit your changes or stash them before you can merge.";
193 memset(&opts, 0, sizeof(opts));
200 opts.fn = threeway_merge;
201 opts.src_index = &the_index;
202 opts.dst_index = &the_index;
205 init_tree_desc_from_tree(t+0, common);
206 init_tree_desc_from_tree(t+1, head);
207 init_tree_desc_from_tree(t+2, merge);
209 rc = unpack_trees(3, t, &opts);
210 cache_tree_free(&active_cache_tree);
214 struct tree *write_tree_from_memory(struct merge_options *o)
216 struct tree *result = NULL;
218 if (unmerged_cache()) {
220 output(o, 0, "There are unmerged index entries:");
221 for (i = 0; i < active_nr; i++) {
222 struct cache_entry *ce = active_cache[i];
224 output(o, 0, "%d %.*s", ce_stage(ce),
225 (int)ce_namelen(ce), ce->name);
230 if (!active_cache_tree)
231 active_cache_tree = cache_tree();
233 if (!cache_tree_fully_valid(active_cache_tree) &&
234 cache_tree_update(active_cache_tree,
235 active_cache, active_nr, 0, 0) < 0)
236 die("error building trees");
238 result = lookup_tree(active_cache_tree->sha1);
243 static int save_files_dirs(const unsigned char *sha1,
244 const char *base, int baselen, const char *path,
245 unsigned int mode, int stage, void *context)
247 int len = strlen(path);
248 char *newpath = xmalloc(baselen + len + 1);
249 struct merge_options *o = context;
251 memcpy(newpath, base, baselen);
252 memcpy(newpath + baselen, path, len);
253 newpath[baselen + len] = '\0';
256 string_list_insert(newpath, &o->current_directory_set);
258 string_list_insert(newpath, &o->current_file_set);
261 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
264 static int get_files_dirs(struct merge_options *o, struct tree *tree)
267 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
269 n = o->current_file_set.nr + o->current_directory_set.nr;
274 * Returns an index_entry instance which doesn't have to correspond to
275 * a real cache entry in Git's index.
277 static struct stage_data *insert_stage_data(const char *path,
278 struct tree *o, struct tree *a, struct tree *b,
279 struct string_list *entries)
281 struct string_list_item *item;
282 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
283 get_tree_entry(o->object.sha1, path,
284 e->stages[1].sha, &e->stages[1].mode);
285 get_tree_entry(a->object.sha1, path,
286 e->stages[2].sha, &e->stages[2].mode);
287 get_tree_entry(b->object.sha1, path,
288 e->stages[3].sha, &e->stages[3].mode);
289 item = string_list_insert(path, entries);
295 * Create a dictionary mapping file names to stage_data objects. The
296 * dictionary contains one entry for every path with a non-zero stage entry.
298 static struct string_list *get_unmerged(void)
300 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
303 unmerged->strdup_strings = 1;
305 for (i = 0; i < active_nr; i++) {
306 struct string_list_item *item;
307 struct stage_data *e;
308 struct cache_entry *ce = active_cache[i];
312 item = string_list_lookup(ce->name, unmerged);
314 item = string_list_insert(ce->name, unmerged);
315 item->util = xcalloc(1, sizeof(struct stage_data));
318 e->stages[ce_stage(ce)].mode = ce->ce_mode;
319 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
327 struct diff_filepair *pair;
328 struct stage_data *src_entry;
329 struct stage_data *dst_entry;
330 unsigned processed:1;
334 * Get information of all renames which occurred between 'o_tree' and
335 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
336 * 'b_tree') to be able to associate the correct cache entries with
337 * the rename information. 'tree' is always equal to either a_tree or b_tree.
339 static struct string_list *get_renames(struct merge_options *o,
344 struct string_list *entries)
347 struct string_list *renames;
348 struct diff_options opts;
350 renames = xcalloc(1, sizeof(struct string_list));
352 DIFF_OPT_SET(&opts, RECURSIVE);
353 opts.detect_rename = DIFF_DETECT_RENAME;
354 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
355 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
357 opts.warn_on_too_large_rename = 1;
358 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
359 if (diff_setup_done(&opts) < 0)
360 die("diff setup failed");
361 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
363 for (i = 0; i < diff_queued_diff.nr; ++i) {
364 struct string_list_item *item;
366 struct diff_filepair *pair = diff_queued_diff.queue[i];
367 if (pair->status != 'R') {
368 diff_free_filepair(pair);
371 re = xmalloc(sizeof(*re));
374 item = string_list_lookup(re->pair->one->path, entries);
376 re->src_entry = insert_stage_data(re->pair->one->path,
377 o_tree, a_tree, b_tree, entries);
379 re->src_entry = item->util;
381 item = string_list_lookup(re->pair->two->path, entries);
383 re->dst_entry = insert_stage_data(re->pair->two->path,
384 o_tree, a_tree, b_tree, entries);
386 re->dst_entry = item->util;
387 item = string_list_insert(pair->one->path, renames);
390 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
391 diff_queued_diff.nr = 0;
396 static int update_stages(const char *path, struct diff_filespec *o,
397 struct diff_filespec *a, struct diff_filespec *b,
400 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
402 if (remove_file_from_cache(path))
405 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
408 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
411 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
416 static int remove_file(struct merge_options *o, int clean,
417 const char *path, int no_wd)
419 int update_cache = o->call_depth || clean;
420 int update_working_directory = !o->call_depth && !no_wd;
423 if (remove_file_from_cache(path))
426 if (update_working_directory) {
427 if (remove_path(path) && errno != ENOENT)
433 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
435 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
438 char *p = newpath + strlen(path);
439 strcpy(newpath, path);
445 while (string_list_has_string(&o->current_file_set, newpath) ||
446 string_list_has_string(&o->current_directory_set, newpath) ||
447 lstat(newpath, &st) == 0)
448 sprintf(p, "_%d", suffix++);
450 string_list_insert(newpath, &o->current_file_set);
454 static void flush_buffer(int fd, const char *buf, unsigned long size)
457 long ret = write_in_full(fd, buf, size);
462 die_errno("merge-recursive");
464 die("merge-recursive: disk full?");
471 static int would_lose_untracked(const char *path)
473 int pos = cache_name_pos(path, strlen(path));
477 while (pos < active_nr &&
478 !strcmp(path, active_cache[pos]->name)) {
480 * If stage #0, it is definitely tracked.
481 * If it has stage #2 then it was tracked
482 * before this merge started. All other
483 * cases the path was not tracked.
485 switch (ce_stage(active_cache[pos])) {
492 return file_exists(path);
495 static int make_room_for_path(const char *path)
498 const char *msg = "failed to create path '%s'%s";
500 status = safe_create_leading_directories_const(path);
503 /* something else exists */
504 error(msg, path, ": perhaps a D/F conflict?");
511 * Do not unlink a file in the work tree if we are not
514 if (would_lose_untracked(path))
515 return error("refusing to lose untracked file at '%s'",
518 /* Successful unlink is good.. */
521 /* .. and so is no existing file */
524 /* .. but not some other error (who really cares what?) */
525 return error(msg, path, ": perhaps a D/F conflict?");
528 static void update_file_flags(struct merge_options *o,
529 const unsigned char *sha,
539 enum object_type type;
543 if (S_ISGITLINK(mode))
545 * We may later decide to recursively descend into
546 * the submodule directory and update its index
547 * and/or work tree, but we do not do that now.
551 buf = read_sha1_file(sha, &type, &size);
553 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
554 if (type != OBJ_BLOB)
555 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
557 struct strbuf strbuf = STRBUF_INIT;
558 if (convert_to_working_tree(path, buf, size, &strbuf)) {
561 buf = strbuf_detach(&strbuf, NULL);
565 if (make_room_for_path(path) < 0) {
570 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
576 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
578 die_errno("failed to open '%s'", path);
579 flush_buffer(fd, buf, size);
581 } else if (S_ISLNK(mode)) {
582 char *lnk = xmemdupz(buf, size);
583 safe_create_leading_directories_const(path);
585 if (symlink(lnk, path))
586 die_errno("failed to symlink '%s'", path);
589 die("do not know what to do with %06o %s '%s'",
590 mode, sha1_to_hex(sha), path);
595 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
598 static void update_file(struct merge_options *o,
600 const unsigned char *sha,
604 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
607 /* Low level file merging, update and removal */
609 struct merge_file_info
611 unsigned char sha[20];
617 static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
620 enum object_type type;
622 if (!hashcmp(sha1, null_sha1)) {
623 mm->ptr = xstrdup("");
628 mm->ptr = read_sha1_file(sha1, &type, &size);
629 if (!mm->ptr || type != OBJ_BLOB)
630 die("unable to read blob object %s", sha1_to_hex(sha1));
634 static int merge_3way(struct merge_options *o,
635 mmbuffer_t *result_buf,
636 struct diff_filespec *one,
637 struct diff_filespec *a,
638 struct diff_filespec *b,
642 mmfile_t orig, src1, src2;
646 if (strcmp(a->path, b->path)) {
647 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
648 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
650 name1 = xstrdup(mkpath("%s", branch1));
651 name2 = xstrdup(mkpath("%s", branch2));
654 fill_mm(one->sha1, &orig);
655 fill_mm(a->sha1, &src1);
656 fill_mm(b->sha1, &src2);
658 merge_status = ll_merge(result_buf, a->path, &orig,
659 &src1, name1, &src2, name2,
670 static struct merge_file_info merge_file(struct merge_options *o,
671 struct diff_filespec *one,
672 struct diff_filespec *a,
673 struct diff_filespec *b,
677 struct merge_file_info result;
681 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
683 if (S_ISREG(a->mode)) {
684 result.mode = a->mode;
685 hashcpy(result.sha, a->sha1);
687 result.mode = b->mode;
688 hashcpy(result.sha, b->sha1);
691 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
697 if (a->mode == b->mode || a->mode == one->mode)
698 result.mode = b->mode;
700 result.mode = a->mode;
701 if (b->mode != one->mode) {
707 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
708 hashcpy(result.sha, b->sha1);
709 else if (sha_eq(b->sha1, one->sha1))
710 hashcpy(result.sha, a->sha1);
711 else if (S_ISREG(a->mode)) {
712 mmbuffer_t result_buf;
715 merge_status = merge_3way(o, &result_buf, one, a, b,
718 if ((merge_status < 0) || !result_buf.ptr)
719 die("Failed to execute internal merge");
721 if (write_sha1_file(result_buf.ptr, result_buf.size,
722 blob_type, result.sha))
723 die("Unable to add %s to database",
726 free(result_buf.ptr);
727 result.clean = (merge_status == 0);
728 } else if (S_ISGITLINK(a->mode)) {
730 hashcpy(result.sha, a->sha1);
731 } else if (S_ISLNK(a->mode)) {
732 hashcpy(result.sha, a->sha1);
734 if (!sha_eq(a->sha1, b->sha1))
737 die("unsupported object type in the tree");
744 static void conflict_rename_rename(struct merge_options *o,
752 const char *ren1_dst = ren1->pair->two->path;
753 const char *ren2_dst = ren2->pair->two->path;
754 const char *dst_name1 = ren1_dst;
755 const char *dst_name2 = ren2_dst;
756 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
757 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
758 output(o, 1, "%s is a directory in %s adding as %s instead",
759 ren1_dst, branch2, dst_name1);
760 remove_file(o, 0, ren1_dst, 0);
762 if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
763 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
764 output(o, 1, "%s is a directory in %s adding as %s instead",
765 ren2_dst, branch1, dst_name2);
766 remove_file(o, 0, ren2_dst, 0);
769 remove_file_from_cache(dst_name1);
770 remove_file_from_cache(dst_name2);
772 * Uncomment to leave the conflicting names in the resulting tree
774 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
775 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
778 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
779 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
785 static void conflict_rename_dir(struct merge_options *o,
789 char *new_path = unique_path(o, ren1->pair->two->path, branch1);
790 output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
791 remove_file(o, 0, ren1->pair->two->path, 0);
792 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
796 static void conflict_rename_rename_2(struct merge_options *o,
802 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
803 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
804 output(o, 1, "Renaming %s to %s and %s to %s instead",
805 ren1->pair->one->path, new_path1,
806 ren2->pair->one->path, new_path2);
807 remove_file(o, 0, ren1->pair->two->path, 0);
808 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
809 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
814 static int process_renames(struct merge_options *o,
815 struct string_list *a_renames,
816 struct string_list *b_renames)
818 int clean_merge = 1, i, j;
819 struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
820 const struct rename *sre;
822 for (i = 0; i < a_renames->nr; i++) {
823 sre = a_renames->items[i].util;
824 string_list_insert(sre->pair->two->path, &a_by_dst)->util
827 for (i = 0; i < b_renames->nr; i++) {
828 sre = b_renames->items[i].util;
829 string_list_insert(sre->pair->two->path, &b_by_dst)->util
833 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
835 struct string_list *renames1, *renames2Dst;
836 struct rename *ren1 = NULL, *ren2 = NULL;
837 const char *branch1, *branch2;
838 const char *ren1_src, *ren1_dst;
840 if (i >= a_renames->nr) {
841 ren2 = b_renames->items[j++].util;
842 } else if (j >= b_renames->nr) {
843 ren1 = a_renames->items[i++].util;
845 int compare = strcmp(a_renames->items[i].string,
846 b_renames->items[j].string);
848 ren1 = a_renames->items[i++].util;
850 ren2 = b_renames->items[j++].util;
853 /* TODO: refactor, so that 1/2 are not needed */
855 renames1 = a_renames;
856 renames2Dst = &b_by_dst;
857 branch1 = o->branch1;
858 branch2 = o->branch2;
861 renames1 = b_renames;
862 renames2Dst = &a_by_dst;
863 branch1 = o->branch2;
864 branch2 = o->branch1;
869 src = ren1->pair->one->path;
871 ren1->dst_entry->processed = 1;
872 ren1->src_entry->processed = 1;
878 ren1_src = ren1->pair->one->path;
879 ren1_dst = ren1->pair->two->path;
882 const char *ren2_src = ren2->pair->one->path;
883 const char *ren2_dst = ren2->pair->two->path;
884 /* Renamed in 1 and renamed in 2 */
885 if (strcmp(ren1_src, ren2_src) != 0)
886 die("ren1.src != ren2.src");
887 ren2->dst_entry->processed = 1;
889 if (strcmp(ren1_dst, ren2_dst) != 0) {
891 output(o, 1, "CONFLICT (rename/rename): "
892 "Rename \"%s\"->\"%s\" in branch \"%s\" "
893 "rename \"%s\"->\"%s\" in \"%s\"%s",
894 src, ren1_dst, branch1,
895 src, ren2_dst, branch2,
896 o->call_depth ? " (left unresolved)": "");
898 remove_file_from_cache(src);
899 update_file(o, 0, ren1->pair->one->sha1,
900 ren1->pair->one->mode, src);
902 conflict_rename_rename(o, ren1, branch1, ren2, branch2);
904 struct merge_file_info mfi;
905 remove_file(o, 1, ren1_src, 1);
912 if (mfi.merge || !mfi.clean)
913 output(o, 1, "Renaming %s->%s", src, ren1_dst);
916 output(o, 2, "Auto-merging %s", ren1_dst);
919 output(o, 1, "CONFLICT (content): merge conflict in %s",
924 update_stages(ren1_dst,
930 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
933 /* Renamed in 1, maybe changed in 2 */
934 struct string_list_item *item;
935 /* we only use sha1 and mode of these */
936 struct diff_filespec src_other, dst_other;
937 int try_merge, stage = a_renames == renames1 ? 3: 2;
939 remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
941 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
942 src_other.mode = ren1->src_entry->stages[stage].mode;
943 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
944 dst_other.mode = ren1->dst_entry->stages[stage].mode;
948 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
950 output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
951 " directory %s added in %s",
952 ren1_src, ren1_dst, branch1,
954 conflict_rename_dir(o, ren1, branch1);
955 } else if (sha_eq(src_other.sha1, null_sha1)) {
957 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
959 ren1_src, ren1_dst, branch1,
961 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
963 update_stages(ren1_dst, NULL,
964 branch1 == o->branch1 ?
965 ren1->pair->two : NULL,
966 branch1 == o->branch1 ?
967 NULL : ren1->pair->two, 1);
968 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
969 const char *new_path;
972 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
974 ren1_src, ren1_dst, branch1,
977 struct merge_file_info mfi;
978 struct diff_filespec one, a, b;
980 one.path = a.path = b.path =
982 hashcpy(one.sha1, null_sha1);
984 hashcpy(a.sha1, ren1->pair->two->sha1);
985 a.mode = ren1->pair->two->mode;
986 hashcpy(b.sha1, dst_other.sha1);
987 b.mode = dst_other.mode;
988 mfi = merge_file(o, &one, &a, &b,
991 output(o, 1, "Adding merged %s", ren1_dst);
997 new_path = unique_path(o, ren1_dst, branch2);
998 output(o, 1, "Adding as %s instead", new_path);
999 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1001 } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
1004 ren2->processed = 1;
1005 output(o, 1, "CONFLICT (rename/rename): "
1006 "Rename %s->%s in %s. "
1007 "Rename %s->%s in %s",
1008 ren1_src, ren1_dst, branch1,
1009 ren2->pair->one->path, ren2->pair->two->path, branch2);
1010 conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
1015 struct diff_filespec *one, *a, *b;
1016 struct merge_file_info mfi;
1017 src_other.path = (char *)ren1_src;
1019 one = ren1->pair->one;
1020 if (a_renames == renames1) {
1021 a = ren1->pair->two;
1024 b = ren1->pair->two;
1027 mfi = merge_file(o, one, a, b,
1028 o->branch1, o->branch2);
1031 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
1032 mfi.mode == ren1->pair->two->mode)
1034 * This messaged is part of
1035 * t6022 test. If you change
1036 * it update the test too.
1038 output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
1040 if (mfi.merge || !mfi.clean)
1041 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
1043 output(o, 2, "Auto-merging %s", ren1_dst);
1045 output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1050 update_stages(ren1_dst,
1053 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
1058 string_list_clear(&a_by_dst, 0);
1059 string_list_clear(&b_by_dst, 0);
1064 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1066 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1069 /* Per entry merge function */
1070 static int process_entry(struct merge_options *o,
1071 const char *path, struct stage_data *entry)
1074 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1075 print_index_entry("\tpath: ", entry);
1077 int clean_merge = 1;
1078 unsigned o_mode = entry->stages[1].mode;
1079 unsigned a_mode = entry->stages[2].mode;
1080 unsigned b_mode = entry->stages[3].mode;
1081 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1082 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1083 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1085 if (o_sha && (!a_sha || !b_sha)) {
1086 /* Case A: Deleted in one */
1087 if ((!a_sha && !b_sha) ||
1088 (sha_eq(a_sha, o_sha) && !b_sha) ||
1089 (!a_sha && sha_eq(b_sha, o_sha))) {
1090 /* Deleted in both or deleted in one and
1091 * unchanged in the other */
1093 output(o, 2, "Removing %s", path);
1094 /* do not touch working file if it did not exist */
1095 remove_file(o, 1, path, !a_sha);
1097 /* Deleted in one and changed in the other */
1100 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1101 "and modified in %s. Version %s of %s left in tree.",
1103 o->branch2, o->branch2, path);
1104 update_file(o, 0, b_sha, b_mode, path);
1106 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1107 "and modified in %s. Version %s of %s left in tree.",
1109 o->branch1, o->branch1, path);
1110 update_file(o, 0, a_sha, a_mode, path);
1114 } else if ((!o_sha && a_sha && !b_sha) ||
1115 (!o_sha && !a_sha && b_sha)) {
1116 /* Case B: Added in one. */
1117 const char *add_branch;
1118 const char *other_branch;
1120 const unsigned char *sha;
1124 add_branch = o->branch1;
1125 other_branch = o->branch2;
1128 conf = "file/directory";
1130 add_branch = o->branch2;
1131 other_branch = o->branch1;
1134 conf = "directory/file";
1136 if (string_list_has_string(&o->current_directory_set, path)) {
1137 const char *new_path = unique_path(o, path, add_branch);
1139 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1141 conf, path, other_branch, path, new_path);
1142 remove_file(o, 0, path, 0);
1143 update_file(o, 0, sha, mode, new_path);
1145 output(o, 2, "Adding %s", path);
1146 update_file(o, 1, sha, mode, path);
1148 } else if (a_sha && b_sha) {
1149 /* Case C: Added in both (check for same permissions) and */
1150 /* case D: Modified in both, but differently. */
1151 const char *reason = "content";
1152 struct merge_file_info mfi;
1153 struct diff_filespec one, a, b;
1157 o_sha = (unsigned char *)null_sha1;
1159 output(o, 2, "Auto-merging %s", path);
1160 one.path = a.path = b.path = (char *)path;
1161 hashcpy(one.sha1, o_sha);
1163 hashcpy(a.sha1, a_sha);
1165 hashcpy(b.sha1, b_sha);
1168 mfi = merge_file(o, &one, &a, &b,
1169 o->branch1, o->branch2);
1171 clean_merge = mfi.clean;
1173 if (S_ISGITLINK(mfi.mode))
1174 reason = "submodule";
1175 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
1178 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1179 } else if (!o_sha && !a_sha && !b_sha) {
1181 * this entry was deleted altogether. a_mode == 0 means
1182 * we had that path and want to actively remove it.
1184 remove_file(o, 1, path, !a_mode);
1186 die("Fatal merge failure, shouldn't happen.");
1191 int merge_trees(struct merge_options *o,
1194 struct tree *common,
1195 struct tree **result)
1199 if (o->subtree_merge) {
1200 merge = shift_tree_object(head, merge);
1201 common = shift_tree_object(head, common);
1204 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1205 output(o, 0, "Already uptodate!");
1210 code = git_merge_trees(o->call_depth, common, head, merge);
1213 if (show(o, 4) || o->call_depth)
1214 die("merging of trees %s and %s failed",
1215 sha1_to_hex(head->object.sha1),
1216 sha1_to_hex(merge->object.sha1));
1221 if (unmerged_cache()) {
1222 struct string_list *entries, *re_head, *re_merge;
1224 string_list_clear(&o->current_file_set, 1);
1225 string_list_clear(&o->current_directory_set, 1);
1226 get_files_dirs(o, head);
1227 get_files_dirs(o, merge);
1229 entries = get_unmerged();
1230 re_head = get_renames(o, head, common, head, merge, entries);
1231 re_merge = get_renames(o, merge, common, head, merge, entries);
1232 clean = process_renames(o, re_head, re_merge);
1233 for (i = 0; i < entries->nr; i++) {
1234 const char *path = entries->items[i].string;
1235 struct stage_data *e = entries->items[i].util;
1237 && !process_entry(o, path, e))
1241 string_list_clear(re_merge, 0);
1242 string_list_clear(re_head, 0);
1243 string_list_clear(entries, 1);
1250 *result = write_tree_from_memory(o);
1255 static struct commit_list *reverse_commit_list(struct commit_list *list)
1257 struct commit_list *next = NULL, *current, *backup;
1258 for (current = list; current; current = backup) {
1259 backup = current->next;
1260 current->next = next;
1267 * Merge the commits h1 and h2, return the resulting virtual
1268 * commit object and a flag indicating the cleanness of the merge.
1270 int merge_recursive(struct merge_options *o,
1273 struct commit_list *ca,
1274 struct commit **result)
1276 struct commit_list *iter;
1277 struct commit *merged_common_ancestors;
1278 struct tree *mrtree = mrtree;
1282 output(o, 4, "Merging:");
1283 output_commit_title(o, h1);
1284 output_commit_title(o, h2);
1288 ca = get_merge_bases(h1, h2, 1);
1289 ca = reverse_commit_list(ca);
1293 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
1294 for (iter = ca; iter; iter = iter->next)
1295 output_commit_title(o, iter->item);
1298 merged_common_ancestors = pop_commit(&ca);
1299 if (merged_common_ancestors == NULL) {
1300 /* if there is no common ancestor, make an empty tree */
1301 struct tree *tree = xcalloc(1, sizeof(struct tree));
1303 tree->object.parsed = 1;
1304 tree->object.type = OBJ_TREE;
1305 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1306 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1309 for (iter = ca; iter; iter = iter->next) {
1310 const char *saved_b1, *saved_b2;
1313 * When the merge fails, the result contains files
1314 * with conflict markers. The cleanness flag is
1315 * ignored, it was never actually used, as result of
1316 * merge_trees has always overwritten it: the committed
1317 * "conflicts" were already resolved.
1320 saved_b1 = o->branch1;
1321 saved_b2 = o->branch2;
1322 o->branch1 = "Temporary merge branch 1";
1323 o->branch2 = "Temporary merge branch 2";
1324 merge_recursive(o, merged_common_ancestors, iter->item,
1325 NULL, &merged_common_ancestors);
1326 o->branch1 = saved_b1;
1327 o->branch2 = saved_b2;
1330 if (!merged_common_ancestors)
1331 die("merge returned no commit");
1338 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1341 if (o->call_depth) {
1342 *result = make_virtual_commit(mrtree, "merged tree");
1343 commit_list_insert(h1, &(*result)->parents);
1344 commit_list_insert(h2, &(*result)->parents->next);
1350 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1352 struct object *object;
1354 object = deref_tag(parse_object(sha1), name, strlen(name));
1357 if (object->type == OBJ_TREE)
1358 return make_virtual_commit((struct tree*)object, name);
1359 if (object->type != OBJ_COMMIT)
1361 if (parse_commit((struct commit *)object))
1363 return (struct commit *)object;
1366 int merge_recursive_generic(struct merge_options *o,
1367 const unsigned char *head,
1368 const unsigned char *merge,
1370 const unsigned char **base_list,
1371 struct commit **result)
1373 int clean, index_fd;
1374 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1375 struct commit *head_commit = get_ref(head, o->branch1);
1376 struct commit *next_commit = get_ref(merge, o->branch2);
1377 struct commit_list *ca = NULL;
1381 for (i = 0; i < num_base_list; ++i) {
1382 struct commit *base;
1383 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1384 return error("Could not parse object '%s'",
1385 sha1_to_hex(base_list[i]));
1386 commit_list_insert(base, &ca);
1390 index_fd = hold_locked_index(lock, 1);
1391 clean = merge_recursive(o, head_commit, next_commit, ca,
1393 if (active_cache_changed &&
1394 (write_cache(index_fd, active_cache, active_nr) ||
1395 commit_locked_index(lock)))
1396 return error("Unable to write index.");
1398 return clean ? 0 : 1;
1401 static int merge_recursive_config(const char *var, const char *value, void *cb)
1403 struct merge_options *o = cb;
1404 if (!strcasecmp(var, "merge.verbosity")) {
1405 o->verbosity = git_config_int(var, value);
1408 if (!strcasecmp(var, "diff.renamelimit")) {
1409 o->diff_rename_limit = git_config_int(var, value);
1412 if (!strcasecmp(var, "merge.renamelimit")) {
1413 o->merge_rename_limit = git_config_int(var, value);
1416 return git_xmerge_config(var, value, cb);
1419 void init_merge_options(struct merge_options *o)
1421 memset(o, 0, sizeof(struct merge_options));
1423 o->buffer_output = 1;
1424 o->diff_rename_limit = -1;
1425 o->merge_rename_limit = -1;
1426 git_config(merge_recursive_config, o);
1427 if (getenv("GIT_MERGE_VERBOSITY"))
1429 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1430 if (o->verbosity >= 5)
1431 o->buffer_output = 0;
1432 strbuf_init(&o->obuf, 0);
1433 memset(&o->current_file_set, 0, sizeof(struct string_list));
1434 o->current_file_set.strdup_strings = 1;
1435 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1436 o->current_directory_set.strdup_strings = 1;