2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
9 #include "cache-tree.h"
13 #include "tree-walk.h"
17 #include "unpack-trees.h"
18 #include "string-list.h"
19 #include "xdiff-interface.h"
22 #include "merge-recursive.h"
24 #include "submodule.h"
26 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
27 const char *subtree_shift)
29 struct object_id shifted;
31 if (!*subtree_shift) {
32 shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, 0);
34 shift_tree_by(one->object.oid.hash, two->object.oid.hash, shifted.hash,
37 if (!oidcmp(&two->object.oid, &shifted))
39 return lookup_tree(shifted.hash);
42 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
44 struct commit *commit = alloc_commit_node();
45 struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
48 desc->obj = (struct object *)commit;
51 commit->object.parsed = 1;
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.
59 static int sha_eq(const unsigned char *a, const unsigned char *b)
63 return a && b && hashcmp(a, b) == 0;
69 RENAME_ONE_FILE_TO_ONE,
70 RENAME_ONE_FILE_TO_TWO,
71 RENAME_TWO_FILES_TO_ONE
74 struct rename_conflict_info {
75 enum rename_type rename_type;
76 struct diff_filepair *pair1;
77 struct diff_filepair *pair2;
80 struct stage_data *dst_entry1;
81 struct stage_data *dst_entry2;
82 struct diff_filespec ren1_other;
83 struct diff_filespec ren2_other;
87 * Since we want to write the index eventually, we cannot reuse the index
88 * for these (temporary) data.
93 unsigned char sha[20];
95 struct rename_conflict_info *rename_conflict_info;
99 static inline void setup_rename_conflict_info(enum rename_type rename_type,
100 struct diff_filepair *pair1,
101 struct diff_filepair *pair2,
104 struct stage_data *dst_entry1,
105 struct stage_data *dst_entry2,
106 struct merge_options *o,
107 struct stage_data *src_entry1,
108 struct stage_data *src_entry2)
110 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
111 ci->rename_type = rename_type;
113 ci->branch1 = branch1;
114 ci->branch2 = branch2;
116 ci->dst_entry1 = dst_entry1;
117 dst_entry1->rename_conflict_info = ci;
118 dst_entry1->processed = 0;
120 assert(!pair2 == !dst_entry2);
122 ci->dst_entry2 = dst_entry2;
124 dst_entry2->rename_conflict_info = ci;
127 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
129 * For each rename, there could have been
130 * modifications on the side of history where that
131 * file was not renamed.
133 int ostage1 = o->branch1 == branch1 ? 3 : 2;
134 int ostage2 = ostage1 ^ 1;
136 ci->ren1_other.path = pair1->one->path;
137 hashcpy(ci->ren1_other.sha1, src_entry1->stages[ostage1].sha);
138 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
140 ci->ren2_other.path = pair2->one->path;
141 hashcpy(ci->ren2_other.sha1, src_entry2->stages[ostage2].sha);
142 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
146 static int show(struct merge_options *o, int v)
148 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
151 static void flush_output(struct merge_options *o)
154 fputs(o->obuf.buf, stdout);
155 strbuf_reset(&o->obuf);
159 __attribute__((format (printf, 3, 4)))
160 static void output(struct merge_options *o, int v, const char *fmt, ...)
167 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
170 strbuf_vaddf(&o->obuf, fmt, ap);
173 strbuf_addch(&o->obuf, '\n');
174 if (!o->buffer_output)
178 static void output_commit_title(struct merge_options *o, struct commit *commit)
182 for (i = o->call_depth; i--;)
185 printf("virtual %s\n", merge_remote_util(commit)->name);
187 printf("%s ", find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
188 if (parse_commit(commit) != 0)
189 printf(_("(bad commit)\n"));
192 const char *msg = get_commit_buffer(commit, NULL);
193 int len = find_commit_subject(msg, &title);
195 printf("%.*s\n", len, title);
196 unuse_commit_buffer(commit, msg);
201 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
202 const char *path, int stage, int refresh, int options)
204 struct cache_entry *ce;
207 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, 0);
209 return error(_("addinfo_cache failed for path '%s'"), path);
211 ret = add_cache_entry(ce, options);
213 struct cache_entry *nce;
215 nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
217 ret = add_cache_entry(nce, options);
222 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
225 init_tree_desc(desc, tree->buffer, tree->size);
228 static int git_merge_trees(int index_only,
234 struct tree_desc t[3];
235 struct unpack_trees_options opts;
237 memset(&opts, 0, sizeof(opts));
244 opts.fn = threeway_merge;
245 opts.src_index = &the_index;
246 opts.dst_index = &the_index;
247 setup_unpack_trees_porcelain(&opts, "merge");
249 init_tree_desc_from_tree(t+0, common);
250 init_tree_desc_from_tree(t+1, head);
251 init_tree_desc_from_tree(t+2, merge);
253 rc = unpack_trees(3, t, &opts);
254 cache_tree_free(&active_cache_tree);
258 struct tree *write_tree_from_memory(struct merge_options *o)
260 struct tree *result = NULL;
262 if (unmerged_cache()) {
264 fprintf(stderr, "BUG: There are unmerged index entries:\n");
265 for (i = 0; i < active_nr; i++) {
266 const struct cache_entry *ce = active_cache[i];
268 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
269 (int)ce_namelen(ce), ce->name);
271 die("Bug in merge-recursive.c");
274 if (!active_cache_tree)
275 active_cache_tree = cache_tree();
277 if (!cache_tree_fully_valid(active_cache_tree) &&
278 cache_tree_update(&the_index, 0) < 0)
279 die(_("error building trees"));
281 result = lookup_tree(active_cache_tree->sha1);
286 static int save_files_dirs(const unsigned char *sha1,
287 struct strbuf *base, const char *path,
288 unsigned int mode, int stage, void *context)
290 int baselen = base->len;
291 struct merge_options *o = context;
293 strbuf_addstr(base, path);
296 string_list_insert(&o->current_directory_set, base->buf);
298 string_list_insert(&o->current_file_set, base->buf);
300 strbuf_setlen(base, baselen);
301 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
304 static int get_files_dirs(struct merge_options *o, struct tree *tree)
307 struct pathspec match_all;
308 memset(&match_all, 0, sizeof(match_all));
309 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
311 n = o->current_file_set.nr + o->current_directory_set.nr;
316 * Returns an index_entry instance which doesn't have to correspond to
317 * a real cache entry in Git's index.
319 static struct stage_data *insert_stage_data(const char *path,
320 struct tree *o, struct tree *a, struct tree *b,
321 struct string_list *entries)
323 struct string_list_item *item;
324 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
325 get_tree_entry(o->object.oid.hash, path,
326 e->stages[1].sha, &e->stages[1].mode);
327 get_tree_entry(a->object.oid.hash, path,
328 e->stages[2].sha, &e->stages[2].mode);
329 get_tree_entry(b->object.oid.hash, path,
330 e->stages[3].sha, &e->stages[3].mode);
331 item = string_list_insert(entries, path);
337 * Create a dictionary mapping file names to stage_data objects. The
338 * dictionary contains one entry for every path with a non-zero stage entry.
340 static struct string_list *get_unmerged(void)
342 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
345 unmerged->strdup_strings = 1;
347 for (i = 0; i < active_nr; i++) {
348 struct string_list_item *item;
349 struct stage_data *e;
350 const struct cache_entry *ce = active_cache[i];
354 item = string_list_lookup(unmerged, ce->name);
356 item = string_list_insert(unmerged, ce->name);
357 item->util = xcalloc(1, sizeof(struct stage_data));
360 e->stages[ce_stage(ce)].mode = ce->ce_mode;
361 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
367 static int string_list_df_name_compare(const void *a, const void *b)
369 const struct string_list_item *one = a;
370 const struct string_list_item *two = b;
371 int onelen = strlen(one->string);
372 int twolen = strlen(two->string);
374 * Here we only care that entries for D/F conflicts are
375 * adjacent, in particular with the file of the D/F conflict
376 * appearing before files below the corresponding directory.
377 * The order of the rest of the list is irrelevant for us.
379 * To achieve this, we sort with df_name_compare and provide
380 * the mode S_IFDIR so that D/F conflicts will sort correctly.
381 * We use the mode S_IFDIR for everything else for simplicity,
382 * since in other cases any changes in their order due to
383 * sorting cause no problems for us.
385 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
386 two->string, twolen, S_IFDIR);
388 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
389 * that 'foo' comes before 'foo/bar'.
393 return onelen - twolen;
396 static void record_df_conflict_files(struct merge_options *o,
397 struct string_list *entries)
399 /* If there is a D/F conflict and the file for such a conflict
400 * currently exist in the working tree, we want to allow it to be
401 * removed to make room for the corresponding directory if needed.
402 * The files underneath the directories of such D/F conflicts will
403 * be processed before the corresponding file involved in the D/F
404 * conflict. If the D/F directory ends up being removed by the
405 * merge, then we won't have to touch the D/F file. If the D/F
406 * directory needs to be written to the working copy, then the D/F
407 * file will simply be removed (in make_room_for_path()) to make
408 * room for the necessary paths. Note that if both the directory
409 * and the file need to be present, then the D/F file will be
410 * reinstated with a new unique name at the time it is processed.
412 struct string_list df_sorted_entries;
413 const char *last_file = NULL;
418 * If we're merging merge-bases, we don't want to bother with
419 * any working directory changes.
424 /* Ensure D/F conflicts are adjacent in the entries list. */
425 memset(&df_sorted_entries, 0, sizeof(struct string_list));
426 for (i = 0; i < entries->nr; i++) {
427 struct string_list_item *next = &entries->items[i];
428 string_list_append(&df_sorted_entries, next->string)->util =
431 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
432 string_list_df_name_compare);
434 string_list_clear(&o->df_conflict_file_set, 1);
435 for (i = 0; i < df_sorted_entries.nr; i++) {
436 const char *path = df_sorted_entries.items[i].string;
437 int len = strlen(path);
438 struct stage_data *e = df_sorted_entries.items[i].util;
441 * Check if last_file & path correspond to a D/F conflict;
442 * i.e. whether path is last_file+'/'+<something>.
443 * If so, record that it's okay to remove last_file to make
444 * room for path and friends if needed.
448 memcmp(path, last_file, last_len) == 0 &&
449 path[last_len] == '/') {
450 string_list_insert(&o->df_conflict_file_set, last_file);
454 * Determine whether path could exist as a file in the
455 * working directory as a possible D/F conflict. This
456 * will only occur when it exists in stage 2 as a
459 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
466 string_list_clear(&df_sorted_entries, 0);
470 struct diff_filepair *pair;
471 struct stage_data *src_entry;
472 struct stage_data *dst_entry;
473 unsigned processed:1;
477 * Get information of all renames which occurred between 'o_tree' and
478 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
479 * 'b_tree') to be able to associate the correct cache entries with
480 * the rename information. 'tree' is always equal to either a_tree or b_tree.
482 static struct string_list *get_renames(struct merge_options *o,
487 struct string_list *entries)
490 struct string_list *renames;
491 struct diff_options opts;
493 renames = xcalloc(1, sizeof(struct string_list));
494 if (!o->detect_rename)
498 DIFF_OPT_SET(&opts, RECURSIVE);
499 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
500 opts.detect_rename = DIFF_DETECT_RENAME;
501 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
502 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
504 opts.rename_score = o->rename_score;
505 opts.show_rename_progress = o->show_rename_progress;
506 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
507 diff_setup_done(&opts);
508 diff_tree_sha1(o_tree->object.oid.hash, tree->object.oid.hash, "", &opts);
510 if (opts.needed_rename_limit > o->needed_rename_limit)
511 o->needed_rename_limit = opts.needed_rename_limit;
512 for (i = 0; i < diff_queued_diff.nr; ++i) {
513 struct string_list_item *item;
515 struct diff_filepair *pair = diff_queued_diff.queue[i];
516 if (pair->status != 'R') {
517 diff_free_filepair(pair);
520 re = xmalloc(sizeof(*re));
523 item = string_list_lookup(entries, re->pair->one->path);
525 re->src_entry = insert_stage_data(re->pair->one->path,
526 o_tree, a_tree, b_tree, entries);
528 re->src_entry = item->util;
530 item = string_list_lookup(entries, re->pair->two->path);
532 re->dst_entry = insert_stage_data(re->pair->two->path,
533 o_tree, a_tree, b_tree, entries);
535 re->dst_entry = item->util;
536 item = string_list_insert(renames, pair->one->path);
539 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
540 diff_queued_diff.nr = 0;
545 static int update_stages(const char *path, const struct diff_filespec *o,
546 const struct diff_filespec *a,
547 const struct diff_filespec *b)
551 * NOTE: It is usually a bad idea to call update_stages on a path
552 * before calling update_file on that same path, since it can
553 * sometimes lead to spurious "refusing to lose untracked file..."
554 * messages from update_file (via make_room_for path via
555 * would_lose_untracked). Instead, reverse the order of the calls
556 * (executing update_file first and then update_stages).
559 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
561 if (remove_file_from_cache(path))
564 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
567 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
570 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
575 static void update_entry(struct stage_data *entry,
576 struct diff_filespec *o,
577 struct diff_filespec *a,
578 struct diff_filespec *b)
580 entry->processed = 0;
581 entry->stages[1].mode = o->mode;
582 entry->stages[2].mode = a->mode;
583 entry->stages[3].mode = b->mode;
584 hashcpy(entry->stages[1].sha, o->sha1);
585 hashcpy(entry->stages[2].sha, a->sha1);
586 hashcpy(entry->stages[3].sha, b->sha1);
589 static int remove_file(struct merge_options *o, int clean,
590 const char *path, int no_wd)
592 int update_cache = o->call_depth || clean;
593 int update_working_directory = !o->call_depth && !no_wd;
596 if (remove_file_from_cache(path))
599 if (update_working_directory) {
601 struct cache_entry *ce;
602 ce = cache_file_exists(path, strlen(path), ignore_case);
603 if (ce && ce_stage(ce) == 0)
606 if (remove_path(path))
612 /* add a string to a strbuf, but converting "/" to "_" */
613 static void add_flattened_path(struct strbuf *out, const char *s)
616 strbuf_addstr(out, s);
617 for (; i < out->len; i++)
618 if (out->buf[i] == '/')
622 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
624 struct strbuf newpath = STRBUF_INIT;
628 strbuf_addf(&newpath, "%s~", path);
629 add_flattened_path(&newpath, branch);
631 base_len = newpath.len;
632 while (string_list_has_string(&o->current_file_set, newpath.buf) ||
633 string_list_has_string(&o->current_directory_set, newpath.buf) ||
634 file_exists(newpath.buf)) {
635 strbuf_setlen(&newpath, base_len);
636 strbuf_addf(&newpath, "_%d", suffix++);
639 string_list_insert(&o->current_file_set, newpath.buf);
640 return strbuf_detach(&newpath, NULL);
643 static int dir_in_way(const char *path, int check_working_copy)
646 struct strbuf dirpath = STRBUF_INIT;
649 strbuf_addstr(&dirpath, path);
650 strbuf_addch(&dirpath, '/');
652 pos = cache_name_pos(dirpath.buf, dirpath.len);
656 if (pos < active_nr &&
657 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
658 strbuf_release(&dirpath);
662 strbuf_release(&dirpath);
663 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
666 static int was_tracked(const char *path)
668 int pos = cache_name_pos(path, strlen(path));
672 while (pos < active_nr &&
673 !strcmp(path, active_cache[pos]->name)) {
675 * If stage #0, it is definitely tracked.
676 * If it has stage #2 then it was tracked
677 * before this merge started. All other
678 * cases the path was not tracked.
680 switch (ce_stage(active_cache[pos])) {
690 static int would_lose_untracked(const char *path)
692 return !was_tracked(path) && file_exists(path);
695 static int make_room_for_path(struct merge_options *o, const char *path)
698 const char *msg = _("failed to create path '%s'%s");
700 /* Unlink any D/F conflict files that are in the way */
701 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
702 const char *df_path = o->df_conflict_file_set.items[i].string;
703 size_t pathlen = strlen(path);
704 size_t df_pathlen = strlen(df_path);
705 if (df_pathlen < pathlen &&
706 path[df_pathlen] == '/' &&
707 strncmp(path, df_path, df_pathlen) == 0) {
709 _("Removing %s to make room for subdirectory\n"),
712 unsorted_string_list_delete_item(&o->df_conflict_file_set,
718 /* Make sure leading directories are created */
719 status = safe_create_leading_directories_const(path);
721 if (status == SCLD_EXISTS) {
722 /* something else exists */
723 error(msg, path, _(": perhaps a D/F conflict?"));
730 * Do not unlink a file in the work tree if we are not
733 if (would_lose_untracked(path))
734 return error(_("refusing to lose untracked file at '%s'"),
737 /* Successful unlink is good.. */
740 /* .. and so is no existing file */
743 /* .. but not some other error (who really cares what?) */
744 return error(msg, path, _(": perhaps a D/F conflict?"));
747 static void update_file_flags(struct merge_options *o,
748 const unsigned char *sha,
758 enum object_type type;
762 if (S_ISGITLINK(mode)) {
764 * We may later decide to recursively descend into
765 * the submodule directory and update its index
766 * and/or work tree, but we do not do that now.
772 buf = read_sha1_file(sha, &type, &size);
774 die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
775 if (type != OBJ_BLOB)
776 die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
778 struct strbuf strbuf = STRBUF_INIT;
779 if (convert_to_working_tree(path, buf, size, &strbuf)) {
782 buf = strbuf_detach(&strbuf, NULL);
786 if (make_room_for_path(o, path) < 0) {
791 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
797 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
799 die_errno(_("failed to open '%s'"), path);
800 write_in_full(fd, buf, size);
802 } else if (S_ISLNK(mode)) {
803 char *lnk = xmemdupz(buf, size);
804 safe_create_leading_directories_const(path);
806 if (symlink(lnk, path))
807 die_errno(_("failed to symlink '%s'"), path);
810 die(_("do not know what to do with %06o %s '%s'"),
811 mode, sha1_to_hex(sha), path);
816 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
819 static void update_file(struct merge_options *o,
821 const unsigned char *sha,
825 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
828 /* Low level file merging, update and removal */
830 struct merge_file_info {
831 unsigned char sha[20];
837 static int merge_3way(struct merge_options *o,
838 mmbuffer_t *result_buf,
839 const struct diff_filespec *one,
840 const struct diff_filespec *a,
841 const struct diff_filespec *b,
845 mmfile_t orig, src1, src2;
846 struct ll_merge_options ll_opts = {0};
847 char *base_name, *name1, *name2;
850 ll_opts.renormalize = o->renormalize;
851 ll_opts.xdl_opts = o->xdl_opts;
854 ll_opts.virtual_ancestor = 1;
857 switch (o->recursive_variant) {
858 case MERGE_RECURSIVE_OURS:
859 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
861 case MERGE_RECURSIVE_THEIRS:
862 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
870 if (strcmp(a->path, b->path) ||
871 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
872 base_name = o->ancestor == NULL ? NULL :
873 mkpathdup("%s:%s", o->ancestor, one->path);
874 name1 = mkpathdup("%s:%s", branch1, a->path);
875 name2 = mkpathdup("%s:%s", branch2, b->path);
877 base_name = o->ancestor == NULL ? NULL :
878 mkpathdup("%s", o->ancestor);
879 name1 = mkpathdup("%s", branch1);
880 name2 = mkpathdup("%s", branch2);
883 read_mmblob(&orig, one->sha1);
884 read_mmblob(&src1, a->sha1);
885 read_mmblob(&src2, b->sha1);
887 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
888 &src1, name1, &src2, name2, &ll_opts);
899 static struct merge_file_info merge_file_1(struct merge_options *o,
900 const struct diff_filespec *one,
901 const struct diff_filespec *a,
902 const struct diff_filespec *b,
906 struct merge_file_info result;
910 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
912 if (S_ISREG(a->mode)) {
913 result.mode = a->mode;
914 hashcpy(result.sha, a->sha1);
916 result.mode = b->mode;
917 hashcpy(result.sha, b->sha1);
920 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
926 if (a->mode == b->mode || a->mode == one->mode)
927 result.mode = b->mode;
929 result.mode = a->mode;
930 if (b->mode != one->mode) {
936 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
937 hashcpy(result.sha, b->sha1);
938 else if (sha_eq(b->sha1, one->sha1))
939 hashcpy(result.sha, a->sha1);
940 else if (S_ISREG(a->mode)) {
941 mmbuffer_t result_buf;
944 merge_status = merge_3way(o, &result_buf, one, a, b,
947 if ((merge_status < 0) || !result_buf.ptr)
948 die(_("Failed to execute internal merge"));
950 if (write_sha1_file(result_buf.ptr, result_buf.size,
951 blob_type, result.sha))
952 die(_("Unable to add %s to database"),
955 free(result_buf.ptr);
956 result.clean = (merge_status == 0);
957 } else if (S_ISGITLINK(a->mode)) {
958 result.clean = merge_submodule(result.sha,
959 one->path, one->sha1,
962 } else if (S_ISLNK(a->mode)) {
963 hashcpy(result.sha, a->sha1);
965 if (!sha_eq(a->sha1, b->sha1))
968 die(_("unsupported object type in the tree"));
975 static struct merge_file_info
976 merge_file_special_markers(struct merge_options *o,
977 const struct diff_filespec *one,
978 const struct diff_filespec *a,
979 const struct diff_filespec *b,
981 const char *filename1,
983 const char *filename2)
987 struct merge_file_info mfi;
990 side1 = xstrfmt("%s:%s", branch1, filename1);
992 side2 = xstrfmt("%s:%s", branch2, filename2);
994 mfi = merge_file_1(o, one, a, b,
995 side1 ? side1 : branch1, side2 ? side2 : branch2);
1001 static struct merge_file_info merge_file_one(struct merge_options *o,
1003 const unsigned char *o_sha, int o_mode,
1004 const unsigned char *a_sha, int a_mode,
1005 const unsigned char *b_sha, int b_mode,
1006 const char *branch1,
1007 const char *branch2)
1009 struct diff_filespec one, a, b;
1011 one.path = a.path = b.path = (char *)path;
1012 hashcpy(one.sha1, o_sha);
1014 hashcpy(a.sha1, a_sha);
1016 hashcpy(b.sha1, b_sha);
1018 return merge_file_1(o, &one, &a, &b, branch1, branch2);
1021 static void handle_change_delete(struct merge_options *o,
1023 const unsigned char *o_sha, int o_mode,
1024 const unsigned char *a_sha, int a_mode,
1025 const unsigned char *b_sha, int b_mode,
1026 const char *change, const char *change_past)
1028 char *renamed = NULL;
1029 if (dir_in_way(path, !o->call_depth)) {
1030 renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1033 if (o->call_depth) {
1035 * We cannot arbitrarily accept either a_sha or b_sha as
1036 * correct; since there is no true "middle point" between
1037 * them, simply reuse the base version for virtual merge base.
1039 remove_file_from_cache(path);
1040 update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
1041 } else if (!a_sha) {
1043 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1044 "and %s in %s. Version %s of %s left in tree."),
1045 change, path, o->branch1, change_past,
1046 o->branch2, o->branch2, path);
1047 update_file(o, 0, b_sha, b_mode, path);
1049 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1050 "and %s in %s. Version %s of %s left in tree at %s."),
1051 change, path, o->branch1, change_past,
1052 o->branch2, o->branch2, path, renamed);
1053 update_file(o, 0, b_sha, b_mode, renamed);
1057 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1058 "and %s in %s. Version %s of %s left in tree."),
1059 change, path, o->branch2, change_past,
1060 o->branch1, o->branch1, path);
1062 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1063 "and %s in %s. Version %s of %s left in tree at %s."),
1064 change, path, o->branch2, change_past,
1065 o->branch1, o->branch1, path, renamed);
1066 update_file(o, 0, a_sha, a_mode, renamed);
1069 * No need to call update_file() on path when !renamed, since
1070 * that would needlessly touch path. We could call
1071 * update_file_flags() with update_cache=0 and update_wd=0,
1072 * but that's a no-op.
1078 static void conflict_rename_delete(struct merge_options *o,
1079 struct diff_filepair *pair,
1080 const char *rename_branch,
1081 const char *other_branch)
1083 const struct diff_filespec *orig = pair->one;
1084 const struct diff_filespec *dest = pair->two;
1085 const unsigned char *a_sha = NULL;
1086 const unsigned char *b_sha = NULL;
1090 if (rename_branch == o->branch1) {
1092 a_mode = dest->mode;
1095 b_mode = dest->mode;
1098 handle_change_delete(o,
1099 o->call_depth ? orig->path : dest->path,
1100 orig->sha1, orig->mode,
1103 _("rename"), _("renamed"));
1105 if (o->call_depth) {
1106 remove_file_from_cache(dest->path);
1108 update_stages(dest->path, NULL,
1109 rename_branch == o->branch1 ? dest : NULL,
1110 rename_branch == o->branch1 ? NULL : dest);
1115 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1116 struct stage_data *entry,
1119 unsigned char *sha = entry->stages[stage].sha;
1120 unsigned mode = entry->stages[stage].mode;
1121 if (mode == 0 || is_null_sha1(sha))
1123 hashcpy(target->sha1, sha);
1124 target->mode = mode;
1128 static void handle_file(struct merge_options *o,
1129 struct diff_filespec *rename,
1131 struct rename_conflict_info *ci)
1133 char *dst_name = rename->path;
1134 struct stage_data *dst_entry;
1135 const char *cur_branch, *other_branch;
1136 struct diff_filespec other;
1137 struct diff_filespec *add;
1140 dst_entry = ci->dst_entry1;
1141 cur_branch = ci->branch1;
1142 other_branch = ci->branch2;
1144 dst_entry = ci->dst_entry2;
1145 cur_branch = ci->branch2;
1146 other_branch = ci->branch1;
1149 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
1151 char *add_name = unique_path(o, rename->path, other_branch);
1152 update_file(o, 0, add->sha1, add->mode, add_name);
1154 remove_file(o, 0, rename->path, 0);
1155 dst_name = unique_path(o, rename->path, cur_branch);
1157 if (dir_in_way(rename->path, !o->call_depth)) {
1158 dst_name = unique_path(o, rename->path, cur_branch);
1159 output(o, 1, _("%s is a directory in %s adding as %s instead"),
1160 rename->path, other_branch, dst_name);
1163 update_file(o, 0, rename->sha1, rename->mode, dst_name);
1165 update_stages(rename->path, NULL, rename, add);
1167 update_stages(rename->path, NULL, add, rename);
1169 if (dst_name != rename->path)
1173 static void conflict_rename_rename_1to2(struct merge_options *o,
1174 struct rename_conflict_info *ci)
1176 /* One file was renamed in both branches, but to different names. */
1177 struct diff_filespec *one = ci->pair1->one;
1178 struct diff_filespec *a = ci->pair1->two;
1179 struct diff_filespec *b = ci->pair2->two;
1181 output(o, 1, _("CONFLICT (rename/rename): "
1182 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1183 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1184 one->path, a->path, ci->branch1,
1185 one->path, b->path, ci->branch2,
1186 o->call_depth ? _(" (left unresolved)") : "");
1187 if (o->call_depth) {
1188 struct merge_file_info mfi;
1189 struct diff_filespec other;
1190 struct diff_filespec *add;
1191 mfi = merge_file_one(o, one->path,
1192 one->sha1, one->mode,
1195 ci->branch1, ci->branch2);
1197 * FIXME: For rename/add-source conflicts (if we could detect
1198 * such), this is wrong. We should instead find a unique
1199 * pathname and then either rename the add-source file to that
1200 * unique path, or use that unique path instead of src here.
1202 update_file(o, 0, mfi.sha, mfi.mode, one->path);
1205 * Above, we put the merged content at the merge-base's
1206 * path. Now we usually need to delete both a->path and
1207 * b->path. However, the rename on each side of the merge
1208 * could also be involved in a rename/add conflict. In
1209 * such cases, we should keep the added file around,
1210 * resolving the conflict at that path in its favor.
1212 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1214 update_file(o, 0, add->sha1, add->mode, a->path);
1216 remove_file_from_cache(a->path);
1217 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1219 update_file(o, 0, add->sha1, add->mode, b->path);
1221 remove_file_from_cache(b->path);
1223 handle_file(o, a, 2, ci);
1224 handle_file(o, b, 3, ci);
1228 static void conflict_rename_rename_2to1(struct merge_options *o,
1229 struct rename_conflict_info *ci)
1231 /* Two files, a & b, were renamed to the same thing, c. */
1232 struct diff_filespec *a = ci->pair1->one;
1233 struct diff_filespec *b = ci->pair2->one;
1234 struct diff_filespec *c1 = ci->pair1->two;
1235 struct diff_filespec *c2 = ci->pair2->two;
1236 char *path = c1->path; /* == c2->path */
1237 struct merge_file_info mfi_c1;
1238 struct merge_file_info mfi_c2;
1240 output(o, 1, _("CONFLICT (rename/rename): "
1241 "Rename %s->%s in %s. "
1242 "Rename %s->%s in %s"),
1243 a->path, c1->path, ci->branch1,
1244 b->path, c2->path, ci->branch2);
1246 remove_file(o, 1, a->path, would_lose_untracked(a->path));
1247 remove_file(o, 1, b->path, would_lose_untracked(b->path));
1249 mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
1250 o->branch1, c1->path,
1251 o->branch2, ci->ren1_other.path);
1252 mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
1253 o->branch1, ci->ren2_other.path,
1254 o->branch2, c2->path);
1256 if (o->call_depth) {
1258 * If mfi_c1.clean && mfi_c2.clean, then it might make
1259 * sense to do a two-way merge of those results. But, I
1260 * think in all cases, it makes sense to have the virtual
1261 * merge base just undo the renames; they can be detected
1262 * again later for the non-recursive merge.
1264 remove_file(o, 0, path, 0);
1265 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
1266 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
1268 char *new_path1 = unique_path(o, path, ci->branch1);
1269 char *new_path2 = unique_path(o, path, ci->branch2);
1270 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
1271 a->path, new_path1, b->path, new_path2);
1272 remove_file(o, 0, path, 0);
1273 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
1274 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
1280 static int process_renames(struct merge_options *o,
1281 struct string_list *a_renames,
1282 struct string_list *b_renames)
1284 int clean_merge = 1, i, j;
1285 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1286 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
1287 const struct rename *sre;
1289 for (i = 0; i < a_renames->nr; i++) {
1290 sre = a_renames->items[i].util;
1291 string_list_insert(&a_by_dst, sre->pair->two->path)->util
1294 for (i = 0; i < b_renames->nr; i++) {
1295 sre = b_renames->items[i].util;
1296 string_list_insert(&b_by_dst, sre->pair->two->path)->util
1300 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1301 struct string_list *renames1, *renames2Dst;
1302 struct rename *ren1 = NULL, *ren2 = NULL;
1303 const char *branch1, *branch2;
1304 const char *ren1_src, *ren1_dst;
1305 struct string_list_item *lookup;
1307 if (i >= a_renames->nr) {
1308 ren2 = b_renames->items[j++].util;
1309 } else if (j >= b_renames->nr) {
1310 ren1 = a_renames->items[i++].util;
1312 int compare = strcmp(a_renames->items[i].string,
1313 b_renames->items[j].string);
1315 ren1 = a_renames->items[i++].util;
1317 ren2 = b_renames->items[j++].util;
1320 /* TODO: refactor, so that 1/2 are not needed */
1322 renames1 = a_renames;
1323 renames2Dst = &b_by_dst;
1324 branch1 = o->branch1;
1325 branch2 = o->branch2;
1328 renames1 = b_renames;
1329 renames2Dst = &a_by_dst;
1330 branch1 = o->branch2;
1331 branch2 = o->branch1;
1337 if (ren1->processed)
1339 ren1->processed = 1;
1340 ren1->dst_entry->processed = 1;
1341 /* BUG: We should only mark src_entry as processed if we
1342 * are not dealing with a rename + add-source case.
1344 ren1->src_entry->processed = 1;
1346 ren1_src = ren1->pair->one->path;
1347 ren1_dst = ren1->pair->two->path;
1350 /* One file renamed on both sides */
1351 const char *ren2_src = ren2->pair->one->path;
1352 const char *ren2_dst = ren2->pair->two->path;
1353 enum rename_type rename_type;
1354 if (strcmp(ren1_src, ren2_src) != 0)
1355 die("ren1_src != ren2_src");
1356 ren2->dst_entry->processed = 1;
1357 ren2->processed = 1;
1358 if (strcmp(ren1_dst, ren2_dst) != 0) {
1359 rename_type = RENAME_ONE_FILE_TO_TWO;
1362 rename_type = RENAME_ONE_FILE_TO_ONE;
1363 /* BUG: We should only remove ren1_src in
1364 * the base stage (think of rename +
1365 * add-source cases).
1367 remove_file(o, 1, ren1_src, 1);
1368 update_entry(ren1->dst_entry,
1373 setup_rename_conflict_info(rename_type,
1383 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1384 /* Two different files renamed to the same thing */
1386 ren2 = lookup->util;
1387 ren2_dst = ren2->pair->two->path;
1388 if (strcmp(ren1_dst, ren2_dst) != 0)
1389 die("ren1_dst != ren2_dst");
1392 ren2->processed = 1;
1394 * BUG: We should only mark src_entry as processed
1395 * if we are not dealing with a rename + add-source
1398 ren2->src_entry->processed = 1;
1400 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1412 /* Renamed in 1, maybe changed in 2 */
1413 /* we only use sha1 and mode of these */
1414 struct diff_filespec src_other, dst_other;
1418 * unpack_trees loads entries from common-commit
1419 * into stage 1, from head-commit into stage 2, and
1420 * from merge-commit into stage 3. We keep track
1421 * of which side corresponds to the rename.
1423 int renamed_stage = a_renames == renames1 ? 2 : 3;
1424 int other_stage = a_renames == renames1 ? 3 : 2;
1426 /* BUG: We should only remove ren1_src in the base
1427 * stage and in other_stage (think of rename +
1430 remove_file(o, 1, ren1_src,
1431 renamed_stage == 2 || !was_tracked(ren1_src));
1433 hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
1434 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1435 hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
1436 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1439 if (sha_eq(src_other.sha1, null_sha1)) {
1440 setup_rename_conflict_info(RENAME_DELETE,
1450 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1451 sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
1453 * Added file on the other side identical to
1454 * the file being renamed: clean merge.
1455 * Also, there is no need to overwrite the
1456 * file already in the working copy, so call
1457 * update_file_flags() instead of
1460 update_file_flags(o,
1461 ren1->pair->two->sha1,
1462 ren1->pair->two->mode,
1464 1, /* update_cache */
1466 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
1469 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1471 ren1_src, ren1_dst, branch1,
1473 if (o->call_depth) {
1474 struct merge_file_info mfi;
1475 mfi = merge_file_one(o, ren1_dst, null_sha1, 0,
1476 ren1->pair->two->sha1, ren1->pair->two->mode,
1477 dst_other.sha1, dst_other.mode,
1479 output(o, 1, _("Adding merged %s"), ren1_dst);
1480 update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
1483 char *new_path = unique_path(o, ren1_dst, branch2);
1484 output(o, 1, _("Adding as %s instead"), new_path);
1485 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1492 struct diff_filespec *one, *a, *b;
1493 src_other.path = (char *)ren1_src;
1495 one = ren1->pair->one;
1496 if (a_renames == renames1) {
1497 a = ren1->pair->two;
1500 b = ren1->pair->two;
1503 update_entry(ren1->dst_entry, one, a, b);
1504 setup_rename_conflict_info(RENAME_NORMAL,
1517 string_list_clear(&a_by_dst, 0);
1518 string_list_clear(&b_by_dst, 0);
1523 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1525 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1528 static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1531 enum object_type type;
1533 buf = read_sha1_file(sha1, &type, &size);
1535 return error(_("cannot read object %s"), sha1_to_hex(sha1));
1536 if (type != OBJ_BLOB) {
1538 return error(_("object %s is not a blob"), sha1_to_hex(sha1));
1540 strbuf_attach(dst, buf, size, size + 1);
1544 static int blob_unchanged(const unsigned char *o_sha,
1546 const unsigned char *a_sha,
1548 int renormalize, const char *path)
1550 struct strbuf o = STRBUF_INIT;
1551 struct strbuf a = STRBUF_INIT;
1552 int ret = 0; /* assume changed for safety */
1554 if (a_mode != o_mode)
1556 if (sha_eq(o_sha, a_sha))
1561 assert(o_sha && a_sha);
1562 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1565 * Note: binary | is used so that both renormalizations are
1566 * performed. Comparison can be skipped if both files are
1567 * unchanged since their sha1s have already been compared.
1569 if (renormalize_buffer(path, o.buf, o.len, &o) |
1570 renormalize_buffer(path, a.buf, a.len, &a))
1571 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1579 static void handle_modify_delete(struct merge_options *o,
1581 unsigned char *o_sha, int o_mode,
1582 unsigned char *a_sha, int a_mode,
1583 unsigned char *b_sha, int b_mode)
1585 handle_change_delete(o,
1590 _("modify"), _("modified"));
1593 static int merge_content(struct merge_options *o,
1595 unsigned char *o_sha, int o_mode,
1596 unsigned char *a_sha, int a_mode,
1597 unsigned char *b_sha, int b_mode,
1598 struct rename_conflict_info *rename_conflict_info)
1600 const char *reason = _("content");
1601 const char *path1 = NULL, *path2 = NULL;
1602 struct merge_file_info mfi;
1603 struct diff_filespec one, a, b;
1604 unsigned df_conflict_remains = 0;
1607 reason = _("add/add");
1608 o_sha = (unsigned char *)null_sha1;
1610 one.path = a.path = b.path = (char *)path;
1611 hashcpy(one.sha1, o_sha);
1613 hashcpy(a.sha1, a_sha);
1615 hashcpy(b.sha1, b_sha);
1618 if (rename_conflict_info) {
1619 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1621 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1622 pair1->two->path : pair1->one->path;
1623 /* If rename_conflict_info->pair2 != NULL, we are in
1624 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1627 path2 = (rename_conflict_info->pair2 ||
1628 o->branch2 == rename_conflict_info->branch1) ?
1629 pair1->two->path : pair1->one->path;
1631 if (dir_in_way(path, !o->call_depth))
1632 df_conflict_remains = 1;
1634 mfi = merge_file_special_markers(o, &one, &a, &b,
1638 if (mfi.clean && !df_conflict_remains &&
1639 sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
1640 int path_renamed_outside_HEAD;
1641 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1643 * The content merge resulted in the same file contents we
1644 * already had. We can return early if those file contents
1645 * are recorded at the correct path (which may not be true
1646 * if the merge involves a rename).
1648 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1649 if (!path_renamed_outside_HEAD) {
1650 add_cacheinfo(mfi.mode, mfi.sha, path,
1651 0, (!o->call_depth), 0);
1655 output(o, 2, _("Auto-merging %s"), path);
1658 if (S_ISGITLINK(mfi.mode))
1659 reason = _("submodule");
1660 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
1662 if (rename_conflict_info && !df_conflict_remains)
1663 update_stages(path, &one, &a, &b);
1666 if (df_conflict_remains) {
1668 if (o->call_depth) {
1669 remove_file_from_cache(path);
1672 update_stages(path, &one, &a, &b);
1674 int file_from_stage2 = was_tracked(path);
1675 struct diff_filespec merged;
1676 hashcpy(merged.sha1, mfi.sha);
1677 merged.mode = mfi.mode;
1679 update_stages(path, NULL,
1680 file_from_stage2 ? &merged : NULL,
1681 file_from_stage2 ? NULL : &merged);
1685 new_path = unique_path(o, path, rename_conflict_info->branch1);
1686 output(o, 1, _("Adding as %s instead"), new_path);
1687 update_file(o, 0, mfi.sha, mfi.mode, new_path);
1691 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1697 /* Per entry merge function */
1698 static int process_entry(struct merge_options *o,
1699 const char *path, struct stage_data *entry)
1701 int clean_merge = 1;
1702 int normalize = o->renormalize;
1703 unsigned o_mode = entry->stages[1].mode;
1704 unsigned a_mode = entry->stages[2].mode;
1705 unsigned b_mode = entry->stages[3].mode;
1706 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1707 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1708 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1710 entry->processed = 1;
1711 if (entry->rename_conflict_info) {
1712 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
1713 switch (conflict_info->rename_type) {
1715 case RENAME_ONE_FILE_TO_ONE:
1716 clean_merge = merge_content(o, path,
1717 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1722 conflict_rename_delete(o, conflict_info->pair1,
1723 conflict_info->branch1,
1724 conflict_info->branch2);
1726 case RENAME_ONE_FILE_TO_TWO:
1728 conflict_rename_rename_1to2(o, conflict_info);
1730 case RENAME_TWO_FILES_TO_ONE:
1732 conflict_rename_rename_2to1(o, conflict_info);
1735 entry->processed = 0;
1738 } else if (o_sha && (!a_sha || !b_sha)) {
1739 /* Case A: Deleted in one */
1740 if ((!a_sha && !b_sha) ||
1741 (!b_sha && blob_unchanged(o_sha, o_mode, a_sha, a_mode, normalize, path)) ||
1742 (!a_sha && blob_unchanged(o_sha, o_mode, b_sha, b_mode, normalize, path))) {
1743 /* Deleted in both or deleted in one and
1744 * unchanged in the other */
1746 output(o, 2, _("Removing %s"), path);
1747 /* do not touch working file if it did not exist */
1748 remove_file(o, 1, path, !a_sha);
1750 /* Modify/delete; deleted side may have put a directory in the way */
1752 handle_modify_delete(o, path, o_sha, o_mode,
1753 a_sha, a_mode, b_sha, b_mode);
1755 } else if ((!o_sha && a_sha && !b_sha) ||
1756 (!o_sha && !a_sha && b_sha)) {
1757 /* Case B: Added in one. */
1758 /* [nothing|directory] -> ([nothing|directory], file) */
1760 const char *add_branch;
1761 const char *other_branch;
1763 const unsigned char *sha;
1767 add_branch = o->branch1;
1768 other_branch = o->branch2;
1771 conf = _("file/directory");
1773 add_branch = o->branch2;
1774 other_branch = o->branch1;
1777 conf = _("directory/file");
1779 if (dir_in_way(path, !o->call_depth)) {
1780 char *new_path = unique_path(o, path, add_branch);
1782 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1784 conf, path, other_branch, path, new_path);
1786 remove_file_from_cache(path);
1787 update_file(o, 0, sha, mode, new_path);
1789 remove_file_from_cache(path);
1792 output(o, 2, _("Adding %s"), path);
1793 /* do not overwrite file if already present */
1794 update_file_flags(o, sha, mode, path, 1, !a_sha);
1796 } else if (a_sha && b_sha) {
1797 /* Case C: Added in both (check for same permissions) and */
1798 /* case D: Modified in both, but differently. */
1799 clean_merge = merge_content(o, path,
1800 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1802 } else if (!o_sha && !a_sha && !b_sha) {
1804 * this entry was deleted altogether. a_mode == 0 means
1805 * we had that path and want to actively remove it.
1807 remove_file(o, 1, path, !a_mode);
1809 die(_("Fatal merge failure, shouldn't happen."));
1814 int merge_trees(struct merge_options *o,
1817 struct tree *common,
1818 struct tree **result)
1822 if (o->subtree_shift) {
1823 merge = shift_tree_object(head, merge, o->subtree_shift);
1824 common = shift_tree_object(head, common, o->subtree_shift);
1827 if (sha_eq(common->object.oid.hash, merge->object.oid.hash)) {
1828 output(o, 0, _("Already up-to-date!"));
1833 code = git_merge_trees(o->call_depth, common, head, merge);
1836 if (show(o, 4) || o->call_depth)
1837 die(_("merging of trees %s and %s failed"),
1838 oid_to_hex(&head->object.oid),
1839 oid_to_hex(&merge->object.oid));
1844 if (unmerged_cache()) {
1845 struct string_list *entries, *re_head, *re_merge;
1847 string_list_clear(&o->current_file_set, 1);
1848 string_list_clear(&o->current_directory_set, 1);
1849 get_files_dirs(o, head);
1850 get_files_dirs(o, merge);
1852 entries = get_unmerged();
1853 record_df_conflict_files(o, entries);
1854 re_head = get_renames(o, head, common, head, merge, entries);
1855 re_merge = get_renames(o, merge, common, head, merge, entries);
1856 clean = process_renames(o, re_head, re_merge);
1857 for (i = entries->nr-1; 0 <= i; i--) {
1858 const char *path = entries->items[i].string;
1859 struct stage_data *e = entries->items[i].util;
1861 && !process_entry(o, path, e))
1864 for (i = 0; i < entries->nr; i++) {
1865 struct stage_data *e = entries->items[i].util;
1867 die(_("Unprocessed path??? %s"),
1868 entries->items[i].string);
1871 string_list_clear(re_merge, 0);
1872 string_list_clear(re_head, 0);
1873 string_list_clear(entries, 1);
1883 *result = write_tree_from_memory(o);
1888 static struct commit_list *reverse_commit_list(struct commit_list *list)
1890 struct commit_list *next = NULL, *current, *backup;
1891 for (current = list; current; current = backup) {
1892 backup = current->next;
1893 current->next = next;
1900 * Merge the commits h1 and h2, return the resulting virtual
1901 * commit object and a flag indicating the cleanness of the merge.
1903 int merge_recursive(struct merge_options *o,
1906 struct commit_list *ca,
1907 struct commit **result)
1909 struct commit_list *iter;
1910 struct commit *merged_common_ancestors;
1911 struct tree *mrtree = mrtree;
1915 output(o, 4, _("Merging:"));
1916 output_commit_title(o, h1);
1917 output_commit_title(o, h2);
1921 ca = get_merge_bases(h1, h2);
1922 ca = reverse_commit_list(ca);
1926 unsigned cnt = commit_list_count(ca);
1928 output(o, 5, Q_("found %u common ancestor:",
1929 "found %u common ancestors:", cnt), cnt);
1930 for (iter = ca; iter; iter = iter->next)
1931 output_commit_title(o, iter->item);
1934 merged_common_ancestors = pop_commit(&ca);
1935 if (merged_common_ancestors == NULL) {
1936 /* if there is no common ancestor, use an empty tree */
1939 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
1940 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1943 for (iter = ca; iter; iter = iter->next) {
1944 const char *saved_b1, *saved_b2;
1947 * When the merge fails, the result contains files
1948 * with conflict markers. The cleanness flag is
1949 * ignored, it was never actually used, as result of
1950 * merge_trees has always overwritten it: the committed
1951 * "conflicts" were already resolved.
1954 saved_b1 = o->branch1;
1955 saved_b2 = o->branch2;
1956 o->branch1 = "Temporary merge branch 1";
1957 o->branch2 = "Temporary merge branch 2";
1958 merge_recursive(o, merged_common_ancestors, iter->item,
1959 NULL, &merged_common_ancestors);
1960 o->branch1 = saved_b1;
1961 o->branch2 = saved_b2;
1964 if (!merged_common_ancestors)
1965 die(_("merge returned no commit"));
1972 o->ancestor = "merged common ancestors";
1973 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1976 if (o->call_depth) {
1977 *result = make_virtual_commit(mrtree, "merged tree");
1978 commit_list_insert(h1, &(*result)->parents);
1979 commit_list_insert(h2, &(*result)->parents->next);
1983 diff_warn_rename_limit("merge.renamelimit",
1984 o->needed_rename_limit, 0);
1988 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1990 struct object *object;
1992 object = deref_tag(parse_object(sha1), name, strlen(name));
1995 if (object->type == OBJ_TREE)
1996 return make_virtual_commit((struct tree*)object, name);
1997 if (object->type != OBJ_COMMIT)
1999 if (parse_commit((struct commit *)object))
2001 return (struct commit *)object;
2004 int merge_recursive_generic(struct merge_options *o,
2005 const unsigned char *head,
2006 const unsigned char *merge,
2008 const unsigned char **base_list,
2009 struct commit **result)
2012 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
2013 struct commit *head_commit = get_ref(head, o->branch1);
2014 struct commit *next_commit = get_ref(merge, o->branch2);
2015 struct commit_list *ca = NULL;
2019 for (i = 0; i < num_base_list; ++i) {
2020 struct commit *base;
2021 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
2022 return error(_("Could not parse object '%s'"),
2023 sha1_to_hex(base_list[i]));
2024 commit_list_insert(base, &ca);
2028 hold_locked_index(lock, 1);
2029 clean = merge_recursive(o, head_commit, next_commit, ca,
2031 if (active_cache_changed &&
2032 write_locked_index(&the_index, lock, COMMIT_LOCK))
2033 return error(_("Unable to write index."));
2035 return clean ? 0 : 1;
2038 static void merge_recursive_config(struct merge_options *o)
2040 git_config_get_int("merge.verbosity", &o->verbosity);
2041 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
2042 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
2043 git_config(git_xmerge_config, NULL);
2046 void init_merge_options(struct merge_options *o)
2048 memset(o, 0, sizeof(struct merge_options));
2050 o->buffer_output = 1;
2051 o->diff_rename_limit = -1;
2052 o->merge_rename_limit = -1;
2054 o->detect_rename = 1;
2055 merge_recursive_config(o);
2056 if (getenv("GIT_MERGE_VERBOSITY"))
2058 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
2059 if (o->verbosity >= 5)
2060 o->buffer_output = 0;
2061 strbuf_init(&o->obuf, 0);
2062 string_list_init(&o->current_file_set, 1);
2063 string_list_init(&o->current_directory_set, 1);
2064 string_list_init(&o->df_conflict_file_set, 1);
2067 int parse_merge_opt(struct merge_options *o, const char *s)
2073 if (!strcmp(s, "ours"))
2074 o->recursive_variant = MERGE_RECURSIVE_OURS;
2075 else if (!strcmp(s, "theirs"))
2076 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2077 else if (!strcmp(s, "subtree"))
2078 o->subtree_shift = "";
2079 else if (skip_prefix(s, "subtree=", &arg))
2080 o->subtree_shift = arg;
2081 else if (!strcmp(s, "patience"))
2082 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2083 else if (!strcmp(s, "histogram"))
2084 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2085 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
2086 long value = parse_algorithm_value(arg);
2089 /* clear out previous settings */
2090 DIFF_XDL_CLR(o, NEED_MINIMAL);
2091 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2092 o->xdl_opts |= value;
2094 else if (!strcmp(s, "ignore-space-change"))
2095 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2096 else if (!strcmp(s, "ignore-all-space"))
2097 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2098 else if (!strcmp(s, "ignore-space-at-eol"))
2099 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2100 else if (!strcmp(s, "renormalize"))
2102 else if (!strcmp(s, "no-renormalize"))
2104 else if (!strcmp(s, "no-renames"))
2105 o->detect_rename = 0;
2106 else if (!strcmp(s, "find-renames")) {
2107 o->detect_rename = 1;
2108 o->rename_score = 0;
2110 else if (skip_prefix(s, "find-renames=", &arg) ||
2111 skip_prefix(s, "rename-threshold=", &arg)) {
2112 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
2114 o->detect_rename = 1;