2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include "cache-tree.h"
11 #include "object-store.h"
12 #include "repository.h"
16 #include "tree-walk.h"
21 #include "unpack-trees.h"
22 #include "string-list.h"
23 #include "xdiff-interface.h"
26 #include "merge-recursive.h"
28 #include "submodule.h"
30 #include "commit-reach.h"
32 struct path_hashmap_entry {
33 struct hashmap_entry e;
34 char path[FLEX_ARRAY];
37 static int path_hashmap_cmp(const void *cmp_data,
39 const void *entry_or_key,
42 const struct path_hashmap_entry *a = entry;
43 const struct path_hashmap_entry *b = entry_or_key;
44 const char *key = keydata;
47 return strcasecmp(a->path, key ? key : b->path);
49 return strcmp(a->path, key ? key : b->path);
52 static unsigned int path_hash(const char *path)
54 return ignore_case ? strihash(path) : strhash(path);
57 static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
60 struct dir_rename_entry key;
64 hashmap_entry_init(&key, strhash(dir));
66 return hashmap_get(hashmap, &key, NULL);
69 static int dir_rename_cmp(const void *unused_cmp_data,
71 const void *entry_or_key,
72 const void *unused_keydata)
74 const struct dir_rename_entry *e1 = entry;
75 const struct dir_rename_entry *e2 = entry_or_key;
77 return strcmp(e1->dir, e2->dir);
80 static void dir_rename_init(struct hashmap *map)
82 hashmap_init(map, dir_rename_cmp, NULL, 0);
85 static void dir_rename_entry_init(struct dir_rename_entry *entry,
88 hashmap_entry_init(entry, strhash(directory));
89 entry->dir = directory;
90 entry->non_unique_new_dir = 0;
91 strbuf_init(&entry->new_dir, 0);
92 string_list_init(&entry->possible_new_dirs, 0);
95 static struct collision_entry *collision_find_entry(struct hashmap *hashmap,
98 struct collision_entry key;
100 hashmap_entry_init(&key, strhash(target_file));
101 key.target_file = target_file;
102 return hashmap_get(hashmap, &key, NULL);
105 static int collision_cmp(void *unused_cmp_data,
106 const struct collision_entry *e1,
107 const struct collision_entry *e2,
108 const void *unused_keydata)
110 return strcmp(e1->target_file, e2->target_file);
113 static void collision_init(struct hashmap *map)
115 hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
118 static void flush_output(struct merge_options *opt)
120 if (opt->buffer_output < 2 && opt->obuf.len) {
121 fputs(opt->obuf.buf, stdout);
122 strbuf_reset(&opt->obuf);
126 static int err(struct merge_options *opt, const char *err, ...)
130 if (opt->buffer_output < 2)
133 strbuf_complete(&opt->obuf, '\n');
134 strbuf_addstr(&opt->obuf, "error: ");
136 va_start(params, err);
137 strbuf_vaddf(&opt->obuf, err, params);
139 if (opt->buffer_output > 1)
140 strbuf_addch(&opt->obuf, '\n');
142 error("%s", opt->obuf.buf);
143 strbuf_reset(&opt->obuf);
149 static struct tree *shift_tree_object(struct repository *repo,
150 struct tree *one, struct tree *two,
151 const char *subtree_shift)
153 struct object_id shifted;
155 if (!*subtree_shift) {
156 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
158 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
161 if (oideq(&two->object.oid, &shifted))
163 return lookup_tree(repo, &shifted);
166 static struct commit *make_virtual_commit(struct repository *repo,
170 struct commit *commit = alloc_commit_node(repo);
172 set_merge_remote_desc(commit, comment, (struct object *)commit);
173 commit->maybe_tree = tree;
174 commit->object.parsed = 1;
179 * Since we use get_tree_entry(), which does not put the read object into
180 * the object pool, we cannot rely on a == b.
182 static int oid_eq(const struct object_id *a, const struct object_id *b)
186 return a && b && oideq(a, b);
194 RENAME_ONE_FILE_TO_ONE,
195 RENAME_ONE_FILE_TO_TWO,
196 RENAME_TWO_FILES_TO_ONE
200 * Since we want to write the index eventually, we cannot reuse the index
201 * for these (temporary) data.
206 struct object_id oid;
208 struct rename_conflict_info *rename_conflict_info;
209 unsigned processed:1;
213 struct diff_filepair *pair;
215 * Purpose of src_entry and dst_entry:
217 * If 'before' is renamed to 'after' then src_entry will contain
218 * the versions of 'before' from the merge_base, HEAD, and MERGE in
219 * stages 1, 2, and 3; dst_entry will contain the respective
220 * versions of 'after' in corresponding locations. Thus, we have a
221 * total of six modes and oids, though some will be null. (Stage 0
222 * is ignored; we're interested in handling conflicts.)
224 * Since we don't turn on break-rewrites by default, neither
225 * src_entry nor dst_entry can have all three of their stages have
226 * non-null oids, meaning at most four of the six will be non-null.
227 * Also, since this is a rename, both src_entry and dst_entry will
228 * have at least one non-null oid, meaning at least two will be
229 * non-null. Of the six oids, a typical rename will have three be
230 * non-null. Only two implies a rename/delete, and four implies a
233 struct stage_data *src_entry;
234 struct stage_data *dst_entry;
235 unsigned add_turned_into_rename:1;
236 unsigned processed:1;
239 struct rename_conflict_info {
240 enum rename_type rename_type;
245 struct diff_filespec ren1_other;
246 struct diff_filespec ren2_other;
249 static inline void setup_rename_conflict_info(enum rename_type rename_type,
250 struct merge_options *opt,
255 struct stage_data *src_entry1,
256 struct stage_data *src_entry2)
258 int ostage1 = 0, ostage2;
259 struct rename_conflict_info *ci;
262 * When we have two renames involved, it's easiest to get the
263 * correct things into stage 2 and 3, and to make sure that the
264 * content merge puts HEAD before the other branch if we just
265 * ensure that branch1 == opt->branch1. So, simply flip arguments
266 * around if we don't have that.
268 if (ren2 && branch1 != opt->branch1) {
269 setup_rename_conflict_info(rename_type,
273 src_entry2, src_entry1);
277 ci = xcalloc(1, sizeof(struct rename_conflict_info));
278 ci->rename_type = rename_type;
281 ci->branch1 = branch1;
282 ci->branch2 = branch2;
284 ci->ren1->dst_entry->processed = 0;
285 ci->ren1->dst_entry->rename_conflict_info = ci;
288 ci->ren2->dst_entry->rename_conflict_info = ci;
292 * For each rename, there could have been
293 * modifications on the side of history where that
294 * file was not renamed.
296 if (rename_type == RENAME_ADD ||
297 rename_type == RENAME_TWO_FILES_TO_ONE) {
298 ostage1 = opt->branch1 == branch1 ? 3 : 2;
300 ci->ren1_other.path = ren1->pair->one->path;
301 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
302 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
305 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
306 ostage2 = ostage1 ^ 1;
308 ci->ren2_other.path = ren2->pair->one->path;
309 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
310 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
314 static int show(struct merge_options *opt, int v)
316 return (!opt->call_depth && opt->verbosity >= v) || opt->verbosity >= 5;
319 __attribute__((format (printf, 3, 4)))
320 static void output(struct merge_options *opt, int v, const char *fmt, ...)
327 strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
330 strbuf_vaddf(&opt->obuf, fmt, ap);
333 strbuf_addch(&opt->obuf, '\n');
334 if (!opt->buffer_output)
338 static void output_commit_title(struct merge_options *opt, struct commit *commit)
340 struct merge_remote_desc *desc;
342 strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
343 desc = merge_remote_util(commit);
345 strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
347 strbuf_add_unique_abbrev(&opt->obuf, &commit->object.oid,
349 strbuf_addch(&opt->obuf, ' ');
350 if (parse_commit(commit) != 0)
351 strbuf_addstr(&opt->obuf, _("(bad commit)\n"));
354 const char *msg = get_commit_buffer(commit, NULL);
355 int len = find_commit_subject(msg, &title);
357 strbuf_addf(&opt->obuf, "%.*s\n", len, title);
358 unuse_commit_buffer(commit, msg);
364 static int add_cacheinfo(struct merge_options *opt,
365 unsigned int mode, const struct object_id *oid,
366 const char *path, int stage, int refresh, int options)
368 struct index_state *istate = opt->repo->index;
369 struct cache_entry *ce;
372 ce = make_cache_entry(istate, mode, oid ? oid : &null_oid, path, stage, 0);
374 return err(opt, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
376 ret = add_index_entry(istate, ce, options);
378 struct cache_entry *nce;
380 nce = refresh_cache_entry(istate, ce,
381 CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
383 return err(opt, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
385 ret = add_index_entry(istate, nce, options);
390 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
393 init_tree_desc(desc, tree->buffer, tree->size);
396 static int unpack_trees_start(struct merge_options *opt,
402 struct tree_desc t[3];
403 struct index_state tmp_index = { NULL };
405 memset(&opt->unpack_opts, 0, sizeof(opt->unpack_opts));
407 opt->unpack_opts.index_only = 1;
409 opt->unpack_opts.update = 1;
410 opt->unpack_opts.merge = 1;
411 opt->unpack_opts.head_idx = 2;
412 opt->unpack_opts.fn = threeway_merge;
413 opt->unpack_opts.src_index = opt->repo->index;
414 opt->unpack_opts.dst_index = &tmp_index;
415 opt->unpack_opts.aggressive = !merge_detect_rename(opt);
416 setup_unpack_trees_porcelain(&opt->unpack_opts, "merge");
418 init_tree_desc_from_tree(t+0, common);
419 init_tree_desc_from_tree(t+1, head);
420 init_tree_desc_from_tree(t+2, merge);
422 rc = unpack_trees(3, t, &opt->unpack_opts);
423 cache_tree_free(&opt->repo->index->cache_tree);
426 * Update opt->repo->index to match the new results, AFTER saving a copy
427 * in opt->orig_index. Update src_index to point to the saved copy.
428 * (verify_uptodate() checks src_index, and the original index is
429 * the one that had the necessary modification timestamps.)
431 opt->orig_index = *opt->repo->index;
432 *opt->repo->index = tmp_index;
433 opt->unpack_opts.src_index = &opt->orig_index;
438 static void unpack_trees_finish(struct merge_options *opt)
440 discard_index(&opt->orig_index);
441 clear_unpack_trees_porcelain(&opt->unpack_opts);
444 struct tree *write_tree_from_memory(struct merge_options *opt)
446 struct tree *result = NULL;
447 struct index_state *istate = opt->repo->index;
449 if (unmerged_index(istate)) {
451 fprintf(stderr, "BUG: There are unmerged index entries:\n");
452 for (i = 0; i < istate->cache_nr; i++) {
453 const struct cache_entry *ce = istate->cache[i];
455 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
456 (int)ce_namelen(ce), ce->name);
458 BUG("unmerged index entries in merge-recursive.c");
461 if (!istate->cache_tree)
462 istate->cache_tree = cache_tree();
464 if (!cache_tree_fully_valid(istate->cache_tree) &&
465 cache_tree_update(istate, 0) < 0) {
466 err(opt, _("error building trees"));
470 result = lookup_tree(opt->repo, &istate->cache_tree->oid);
475 static int save_files_dirs(const struct object_id *oid,
476 struct strbuf *base, const char *path,
477 unsigned int mode, int stage, void *context)
479 struct path_hashmap_entry *entry;
480 int baselen = base->len;
481 struct merge_options *opt = context;
483 strbuf_addstr(base, path);
485 FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
486 hashmap_entry_init(entry, path_hash(entry->path));
487 hashmap_add(&opt->current_file_dir_set, entry);
489 strbuf_setlen(base, baselen);
490 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
493 static void get_files_dirs(struct merge_options *opt, struct tree *tree)
495 struct pathspec match_all;
496 memset(&match_all, 0, sizeof(match_all));
497 read_tree_recursive(the_repository, tree, "", 0, 0,
498 &match_all, save_files_dirs, opt);
501 static int get_tree_entry_if_blob(const struct object_id *tree,
503 struct object_id *hashy,
504 unsigned short *mode_o)
508 ret = get_tree_entry(tree, path, hashy, mode_o);
509 if (S_ISDIR(*mode_o)) {
510 oidcpy(hashy, &null_oid);
517 * Returns an index_entry instance which doesn't have to correspond to
518 * a real cache entry in Git's index.
520 static struct stage_data *insert_stage_data(const char *path,
521 struct tree *o, struct tree *a, struct tree *b,
522 struct string_list *entries)
524 struct string_list_item *item;
525 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
526 get_tree_entry_if_blob(&o->object.oid, path,
527 &e->stages[1].oid, &e->stages[1].mode);
528 get_tree_entry_if_blob(&a->object.oid, path,
529 &e->stages[2].oid, &e->stages[2].mode);
530 get_tree_entry_if_blob(&b->object.oid, path,
531 &e->stages[3].oid, &e->stages[3].mode);
532 item = string_list_insert(entries, path);
538 * Create a dictionary mapping file names to stage_data objects. The
539 * dictionary contains one entry for every path with a non-zero stage entry.
541 static struct string_list *get_unmerged(struct index_state *istate)
543 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
546 unmerged->strdup_strings = 1;
548 for (i = 0; i < istate->cache_nr; i++) {
549 struct string_list_item *item;
550 struct stage_data *e;
551 const struct cache_entry *ce = istate->cache[i];
555 item = string_list_lookup(unmerged, ce->name);
557 item = string_list_insert(unmerged, ce->name);
558 item->util = xcalloc(1, sizeof(struct stage_data));
561 e->stages[ce_stage(ce)].mode = ce->ce_mode;
562 oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
568 static int string_list_df_name_compare(const char *one, const char *two)
570 int onelen = strlen(one);
571 int twolen = strlen(two);
573 * Here we only care that entries for D/F conflicts are
574 * adjacent, in particular with the file of the D/F conflict
575 * appearing before files below the corresponding directory.
576 * The order of the rest of the list is irrelevant for us.
578 * To achieve this, we sort with df_name_compare and provide
579 * the mode S_IFDIR so that D/F conflicts will sort correctly.
580 * We use the mode S_IFDIR for everything else for simplicity,
581 * since in other cases any changes in their order due to
582 * sorting cause no problems for us.
584 int cmp = df_name_compare(one, onelen, S_IFDIR,
585 two, twolen, S_IFDIR);
587 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
588 * that 'foo' comes before 'foo/bar'.
592 return onelen - twolen;
595 static void record_df_conflict_files(struct merge_options *opt,
596 struct string_list *entries)
598 /* If there is a D/F conflict and the file for such a conflict
599 * currently exists in the working tree, we want to allow it to be
600 * removed to make room for the corresponding directory if needed.
601 * The files underneath the directories of such D/F conflicts will
602 * be processed before the corresponding file involved in the D/F
603 * conflict. If the D/F directory ends up being removed by the
604 * merge, then we won't have to touch the D/F file. If the D/F
605 * directory needs to be written to the working copy, then the D/F
606 * file will simply be removed (in make_room_for_path()) to make
607 * room for the necessary paths. Note that if both the directory
608 * and the file need to be present, then the D/F file will be
609 * reinstated with a new unique name at the time it is processed.
611 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
612 const char *last_file = NULL;
617 * If we're merging merge-bases, we don't want to bother with
618 * any working directory changes.
623 /* Ensure D/F conflicts are adjacent in the entries list. */
624 for (i = 0; i < entries->nr; i++) {
625 struct string_list_item *next = &entries->items[i];
626 string_list_append(&df_sorted_entries, next->string)->util =
629 df_sorted_entries.cmp = string_list_df_name_compare;
630 string_list_sort(&df_sorted_entries);
632 string_list_clear(&opt->df_conflict_file_set, 1);
633 for (i = 0; i < df_sorted_entries.nr; i++) {
634 const char *path = df_sorted_entries.items[i].string;
635 int len = strlen(path);
636 struct stage_data *e = df_sorted_entries.items[i].util;
639 * Check if last_file & path correspond to a D/F conflict;
640 * i.e. whether path is last_file+'/'+<something>.
641 * If so, record that it's okay to remove last_file to make
642 * room for path and friends if needed.
646 memcmp(path, last_file, last_len) == 0 &&
647 path[last_len] == '/') {
648 string_list_insert(&opt->df_conflict_file_set, last_file);
652 * Determine whether path could exist as a file in the
653 * working directory as a possible D/F conflict. This
654 * will only occur when it exists in stage 2 as a
657 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
664 string_list_clear(&df_sorted_entries, 0);
667 static int update_stages(struct merge_options *opt, const char *path,
668 const struct diff_filespec *o,
669 const struct diff_filespec *a,
670 const struct diff_filespec *b)
674 * NOTE: It is usually a bad idea to call update_stages on a path
675 * before calling update_file on that same path, since it can
676 * sometimes lead to spurious "refusing to lose untracked file..."
677 * messages from update_file (via make_room_for path via
678 * would_lose_untracked). Instead, reverse the order of the calls
679 * (executing update_file first and then update_stages).
682 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
684 if (remove_file_from_index(opt->repo->index, path))
687 if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
690 if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
693 if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
698 static void update_entry(struct stage_data *entry,
699 struct diff_filespec *o,
700 struct diff_filespec *a,
701 struct diff_filespec *b)
703 entry->processed = 0;
704 entry->stages[1].mode = o->mode;
705 entry->stages[2].mode = a->mode;
706 entry->stages[3].mode = b->mode;
707 oidcpy(&entry->stages[1].oid, &o->oid);
708 oidcpy(&entry->stages[2].oid, &a->oid);
709 oidcpy(&entry->stages[3].oid, &b->oid);
712 static int remove_file(struct merge_options *opt, int clean,
713 const char *path, int no_wd)
715 int update_cache = opt->call_depth || clean;
716 int update_working_directory = !opt->call_depth && !no_wd;
719 if (remove_file_from_index(opt->repo->index, path))
722 if (update_working_directory) {
724 struct cache_entry *ce;
725 ce = index_file_exists(opt->repo->index, path, strlen(path),
727 if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
730 if (remove_path(path))
736 /* add a string to a strbuf, but converting "/" to "_" */
737 static void add_flattened_path(struct strbuf *out, const char *s)
740 strbuf_addstr(out, s);
741 for (; i < out->len; i++)
742 if (out->buf[i] == '/')
746 static char *unique_path(struct merge_options *opt, const char *path, const char *branch)
748 struct path_hashmap_entry *entry;
749 struct strbuf newpath = STRBUF_INIT;
753 strbuf_addf(&newpath, "%s~", path);
754 add_flattened_path(&newpath, branch);
756 base_len = newpath.len;
757 while (hashmap_get_from_hash(&opt->current_file_dir_set,
758 path_hash(newpath.buf), newpath.buf) ||
759 (!opt->call_depth && file_exists(newpath.buf))) {
760 strbuf_setlen(&newpath, base_len);
761 strbuf_addf(&newpath, "_%d", suffix++);
764 FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
765 hashmap_entry_init(entry, path_hash(entry->path));
766 hashmap_add(&opt->current_file_dir_set, entry);
767 return strbuf_detach(&newpath, NULL);
771 * Check whether a directory in the index is in the way of an incoming
772 * file. Return 1 if so. If check_working_copy is non-zero, also
773 * check the working directory. If empty_ok is non-zero, also return
774 * 0 in the case where the working-tree dir exists but is empty.
776 static int dir_in_way(struct index_state *istate, const char *path,
777 int check_working_copy, int empty_ok)
780 struct strbuf dirpath = STRBUF_INIT;
783 strbuf_addstr(&dirpath, path);
784 strbuf_addch(&dirpath, '/');
786 pos = index_name_pos(istate, dirpath.buf, dirpath.len);
790 if (pos < istate->cache_nr &&
791 !strncmp(dirpath.buf, istate->cache[pos]->name, dirpath.len)) {
792 strbuf_release(&dirpath);
796 strbuf_release(&dirpath);
797 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
798 !(empty_ok && is_empty_dir(path));
802 * Returns whether path was tracked in the index before the merge started,
803 * and its oid and mode match the specified values
805 static int was_tracked_and_matches(struct merge_options *opt, const char *path,
806 const struct object_id *oid, unsigned mode)
808 int pos = index_name_pos(&opt->orig_index, path, strlen(path));
809 struct cache_entry *ce;
812 /* we were not tracking this path before the merge */
815 /* See if the file we were tracking before matches */
816 ce = opt->orig_index.cache[pos];
817 return (oid_eq(&ce->oid, oid) && ce->ce_mode == mode);
821 * Returns whether path was tracked in the index before the merge started
823 static int was_tracked(struct merge_options *opt, const char *path)
825 int pos = index_name_pos(&opt->orig_index, path, strlen(path));
828 /* we were tracking this path before the merge */
834 static int would_lose_untracked(struct merge_options *opt, const char *path)
836 struct index_state *istate = opt->repo->index;
839 * This may look like it can be simplified to:
840 * return !was_tracked(opt, path) && file_exists(path)
841 * but it can't. This function needs to know whether path was in
842 * the working tree due to EITHER having been tracked in the index
843 * before the merge OR having been put into the working copy and
844 * index by unpack_trees(). Due to that either-or requirement, we
845 * check the current index instead of the original one.
847 * Note that we do not need to worry about merge-recursive itself
848 * updating the index after unpack_trees() and before calling this
849 * function, because we strictly require all code paths in
850 * merge-recursive to update the working tree first and the index
851 * second. Doing otherwise would break
852 * update_file()/would_lose_untracked(); see every comment in this
853 * file which mentions "update_stages".
855 int pos = index_name_pos(istate, path, strlen(path));
859 while (pos < istate->cache_nr &&
860 !strcmp(path, istate->cache[pos]->name)) {
862 * If stage #0, it is definitely tracked.
863 * If it has stage #2 then it was tracked
864 * before this merge started. All other
865 * cases the path was not tracked.
867 switch (ce_stage(istate->cache[pos])) {
874 return file_exists(path);
877 static int was_dirty(struct merge_options *opt, const char *path)
879 struct cache_entry *ce;
882 if (opt->call_depth || !was_tracked(opt, path))
885 ce = index_file_exists(opt->unpack_opts.src_index,
886 path, strlen(path), ignore_case);
887 dirty = verify_uptodate(ce, &opt->unpack_opts) != 0;
891 static int make_room_for_path(struct merge_options *opt, const char *path)
894 const char *msg = _("failed to create path '%s'%s");
896 /* Unlink any D/F conflict files that are in the way */
897 for (i = 0; i < opt->df_conflict_file_set.nr; i++) {
898 const char *df_path = opt->df_conflict_file_set.items[i].string;
899 size_t pathlen = strlen(path);
900 size_t df_pathlen = strlen(df_path);
901 if (df_pathlen < pathlen &&
902 path[df_pathlen] == '/' &&
903 strncmp(path, df_path, df_pathlen) == 0) {
905 _("Removing %s to make room for subdirectory\n"),
908 unsorted_string_list_delete_item(&opt->df_conflict_file_set,
914 /* Make sure leading directories are created */
915 status = safe_create_leading_directories_const(path);
917 if (status == SCLD_EXISTS)
918 /* something else exists */
919 return err(opt, msg, path, _(": perhaps a D/F conflict?"));
920 return err(opt, msg, path, "");
924 * Do not unlink a file in the work tree if we are not
927 if (would_lose_untracked(opt, path))
928 return err(opt, _("refusing to lose untracked file at '%s'"),
931 /* Successful unlink is good.. */
934 /* .. and so is no existing file */
937 /* .. but not some other error (who really cares what?) */
938 return err(opt, msg, path, _(": perhaps a D/F conflict?"));
941 static int update_file_flags(struct merge_options *opt,
942 const struct object_id *oid,
954 enum object_type type;
958 if (S_ISGITLINK(mode)) {
960 * We may later decide to recursively descend into
961 * the submodule directory and update its index
962 * and/or work tree, but we do not do that now.
968 buf = read_object_file(oid, &type, &size);
970 return err(opt, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
971 if (type != OBJ_BLOB) {
972 ret = err(opt, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
976 struct strbuf strbuf = STRBUF_INIT;
977 if (convert_to_working_tree(opt->repo->index, path, buf, size, &strbuf)) {
980 buf = strbuf_detach(&strbuf, NULL);
984 if (make_room_for_path(opt, path) < 0) {
988 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
994 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
996 ret = err(opt, _("failed to open '%s': %s"),
997 path, strerror(errno));
1000 write_in_full(fd, buf, size);
1002 } else if (S_ISLNK(mode)) {
1003 char *lnk = xmemdupz(buf, size);
1004 safe_create_leading_directories_const(path);
1006 if (symlink(lnk, path))
1007 ret = err(opt, _("failed to symlink '%s': %s"),
1008 path, strerror(errno));
1012 _("do not know what to do with %06o %s '%s'"),
1013 mode, oid_to_hex(oid), path);
1018 if (!ret && update_cache)
1019 if (add_cacheinfo(opt, mode, oid, path, 0, update_wd,
1020 ADD_CACHE_OK_TO_ADD))
1025 static int update_file(struct merge_options *opt,
1027 const struct object_id *oid,
1031 return update_file_flags(opt, oid, mode, path, opt->call_depth || clean, !opt->call_depth);
1034 /* Low level file merging, update and removal */
1036 struct merge_file_info {
1037 struct object_id oid;
1043 static int merge_3way(struct merge_options *opt,
1044 mmbuffer_t *result_buf,
1045 const struct diff_filespec *o,
1046 const struct diff_filespec *a,
1047 const struct diff_filespec *b,
1048 const char *branch1,
1049 const char *branch2,
1050 const int extra_marker_size)
1052 mmfile_t orig, src1, src2;
1053 struct ll_merge_options ll_opts = {0};
1054 char *base_name, *name1, *name2;
1057 ll_opts.renormalize = opt->renormalize;
1058 ll_opts.extra_marker_size = extra_marker_size;
1059 ll_opts.xdl_opts = opt->xdl_opts;
1061 if (opt->call_depth) {
1062 ll_opts.virtual_ancestor = 1;
1063 ll_opts.variant = 0;
1065 switch (opt->recursive_variant) {
1066 case MERGE_RECURSIVE_OURS:
1067 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
1069 case MERGE_RECURSIVE_THEIRS:
1070 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
1073 ll_opts.variant = 0;
1078 if (strcmp(a->path, b->path) ||
1079 (opt->ancestor != NULL && strcmp(a->path, o->path) != 0)) {
1080 base_name = opt->ancestor == NULL ? NULL :
1081 mkpathdup("%s:%s", opt->ancestor, o->path);
1082 name1 = mkpathdup("%s:%s", branch1, a->path);
1083 name2 = mkpathdup("%s:%s", branch2, b->path);
1085 base_name = opt->ancestor == NULL ? NULL :
1086 mkpathdup("%s", opt->ancestor);
1087 name1 = mkpathdup("%s", branch1);
1088 name2 = mkpathdup("%s", branch2);
1091 read_mmblob(&orig, &o->oid);
1092 read_mmblob(&src1, &a->oid);
1093 read_mmblob(&src2, &b->oid);
1095 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
1096 &src1, name1, &src2, name2,
1097 opt->repo->index, &ll_opts);
1105 return merge_status;
1108 static int find_first_merges(struct repository *repo,
1109 struct object_array *result, const char *path,
1110 struct commit *a, struct commit *b)
1113 struct object_array merges = OBJECT_ARRAY_INIT;
1114 struct commit *commit;
1115 int contains_another;
1117 char merged_revision[42];
1118 const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
1119 "--all", merged_revision, NULL };
1120 struct rev_info revs;
1121 struct setup_revision_opt rev_opts;
1123 memset(result, 0, sizeof(struct object_array));
1124 memset(&rev_opts, 0, sizeof(rev_opts));
1126 /* get all revisions that merge commit a */
1127 xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
1128 oid_to_hex(&a->object.oid));
1129 repo_init_revisions(repo, &revs, NULL);
1130 rev_opts.submodule = path;
1131 /* FIXME: can't handle linked worktrees in submodules yet */
1132 revs.single_worktree = path != NULL;
1133 setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
1135 /* save all revisions from the above list that contain b */
1136 if (prepare_revision_walk(&revs))
1137 die("revision walk setup failed");
1138 while ((commit = get_revision(&revs)) != NULL) {
1139 struct object *o = &(commit->object);
1140 if (in_merge_bases(b, commit))
1141 add_object_array(o, NULL, &merges);
1143 reset_revision_walk();
1145 /* Now we've got all merges that contain a and b. Prune all
1146 * merges that contain another found merge and save them in
1149 for (i = 0; i < merges.nr; i++) {
1150 struct commit *m1 = (struct commit *) merges.objects[i].item;
1152 contains_another = 0;
1153 for (j = 0; j < merges.nr; j++) {
1154 struct commit *m2 = (struct commit *) merges.objects[j].item;
1155 if (i != j && in_merge_bases(m2, m1)) {
1156 contains_another = 1;
1161 if (!contains_another)
1162 add_object_array(merges.objects[i].item, NULL, result);
1165 object_array_clear(&merges);
1169 static void print_commit(struct commit *commit)
1171 struct strbuf sb = STRBUF_INIT;
1172 struct pretty_print_context ctx = {0};
1173 ctx.date_mode.type = DATE_NORMAL;
1174 format_commit_message(commit, " %h: %m %s", &sb, &ctx);
1175 fprintf(stderr, "%s\n", sb.buf);
1176 strbuf_release(&sb);
1179 static int merge_submodule(struct merge_options *opt,
1180 struct object_id *result, const char *path,
1181 const struct object_id *base, const struct object_id *a,
1182 const struct object_id *b)
1184 struct commit *commit_base, *commit_a, *commit_b;
1186 struct object_array merges;
1189 int search = !opt->call_depth;
1191 /* store a in result in case we fail */
1194 /* we can not handle deletion conflicts */
1195 if (is_null_oid(base))
1202 if (add_submodule_odb(path)) {
1203 output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
1207 if (!(commit_base = lookup_commit_reference(opt->repo, base)) ||
1208 !(commit_a = lookup_commit_reference(opt->repo, a)) ||
1209 !(commit_b = lookup_commit_reference(opt->repo, b))) {
1210 output(opt, 1, _("Failed to merge submodule %s (commits not present)"), path);
1214 /* check whether both changes are forward */
1215 if (!in_merge_bases(commit_base, commit_a) ||
1216 !in_merge_bases(commit_base, commit_b)) {
1217 output(opt, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
1221 /* Case #1: a is contained in b or vice versa */
1222 if (in_merge_bases(commit_a, commit_b)) {
1225 output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1226 output_commit_title(opt, commit_b);
1227 } else if (show(opt, 2))
1228 output(opt, 2, _("Fast-forwarding submodule %s"), path);
1234 if (in_merge_bases(commit_b, commit_a)) {
1237 output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1238 output_commit_title(opt, commit_a);
1239 } else if (show(opt, 2))
1240 output(opt, 2, _("Fast-forwarding submodule %s"), path);
1248 * Case #2: There are one or more merges that contain a and b in
1249 * the submodule. If there is only one, then present it as a
1250 * suggestion to the user, but leave it marked unmerged so the
1251 * user needs to confirm the resolution.
1254 /* Skip the search if makes no sense to the calling context. */
1258 /* find commit which merges them */
1259 parent_count = find_first_merges(opt->repo, &merges, path,
1260 commit_a, commit_b);
1261 switch (parent_count) {
1263 output(opt, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
1267 output(opt, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
1268 output(opt, 2, _("Found a possible merge resolution for the submodule:\n"));
1269 print_commit((struct commit *) merges.objects[0].item);
1271 "If this is correct simply add it to the index "
1274 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1275 "which will accept this suggestion.\n"),
1276 oid_to_hex(&merges.objects[0].item->oid), path);
1280 output(opt, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
1281 for (i = 0; i < merges.nr; i++)
1282 print_commit((struct commit *) merges.objects[i].item);
1285 object_array_clear(&merges);
1289 static int merge_mode_and_contents(struct merge_options *opt,
1290 const struct diff_filespec *o,
1291 const struct diff_filespec *a,
1292 const struct diff_filespec *b,
1293 const char *filename,
1294 const char *branch1,
1295 const char *branch2,
1296 const int extra_marker_size,
1297 struct merge_file_info *result)
1299 if (opt->branch1 != branch1) {
1301 * It's weird getting a reverse merge with HEAD on the bottom
1302 * side of the conflict markers and the other branch on the
1305 return merge_mode_and_contents(opt, o, b, a,
1308 extra_marker_size, result);
1314 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
1316 if (S_ISREG(a->mode)) {
1317 result->mode = a->mode;
1318 oidcpy(&result->oid, &a->oid);
1320 result->mode = b->mode;
1321 oidcpy(&result->oid, &b->oid);
1324 if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid))
1330 if (a->mode == b->mode || a->mode == o->mode)
1331 result->mode = b->mode;
1333 result->mode = a->mode;
1334 if (b->mode != o->mode) {
1340 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid))
1341 oidcpy(&result->oid, &b->oid);
1342 else if (oid_eq(&b->oid, &o->oid))
1343 oidcpy(&result->oid, &a->oid);
1344 else if (S_ISREG(a->mode)) {
1345 mmbuffer_t result_buf;
1346 int ret = 0, merge_status;
1348 merge_status = merge_3way(opt, &result_buf, o, a, b,
1352 if ((merge_status < 0) || !result_buf.ptr)
1353 ret = err(opt, _("Failed to execute internal merge"));
1356 write_object_file(result_buf.ptr, result_buf.size,
1357 blob_type, &result->oid))
1358 ret = err(opt, _("Unable to add %s to database"),
1361 free(result_buf.ptr);
1364 result->clean = (merge_status == 0);
1365 } else if (S_ISGITLINK(a->mode)) {
1366 result->clean = merge_submodule(opt, &result->oid,
1371 } else if (S_ISLNK(a->mode)) {
1372 switch (opt->recursive_variant) {
1373 case MERGE_RECURSIVE_NORMAL:
1374 oidcpy(&result->oid, &a->oid);
1375 if (!oid_eq(&a->oid, &b->oid))
1378 case MERGE_RECURSIVE_OURS:
1379 oidcpy(&result->oid, &a->oid);
1381 case MERGE_RECURSIVE_THEIRS:
1382 oidcpy(&result->oid, &b->oid);
1386 BUG("unsupported object type in the tree");
1390 output(opt, 2, _("Auto-merging %s"), filename);
1395 static int handle_rename_via_dir(struct merge_options *opt,
1396 struct diff_filepair *pair,
1397 const char *rename_branch)
1400 * Handle file adds that need to be renamed due to directory rename
1401 * detection. This differs from handle_rename_normal, because
1402 * there is no content merge to do; just move the file into the
1403 * desired final location.
1405 const struct diff_filespec *dest = pair->two;
1407 if (!opt->call_depth && would_lose_untracked(opt, dest->path)) {
1408 char *alt_path = unique_path(opt, dest->path, rename_branch);
1410 output(opt, 1, _("Error: Refusing to lose untracked file at %s; "
1411 "writing to %s instead."),
1412 dest->path, alt_path);
1414 * Write the file in worktree at alt_path, but not in the
1415 * index. Instead, write to dest->path for the index but
1416 * only at the higher appropriate stage.
1418 if (update_file(opt, 0, &dest->oid, dest->mode, alt_path))
1421 return update_stages(opt, dest->path, NULL,
1422 rename_branch == opt->branch1 ? dest : NULL,
1423 rename_branch == opt->branch1 ? NULL : dest);
1426 /* Update dest->path both in index and in worktree */
1427 if (update_file(opt, 1, &dest->oid, dest->mode, dest->path))
1432 static int handle_change_delete(struct merge_options *opt,
1433 const char *path, const char *old_path,
1434 const struct object_id *o_oid, int o_mode,
1435 const struct object_id *changed_oid,
1437 const char *change_branch,
1438 const char *delete_branch,
1439 const char *change, const char *change_past)
1441 char *alt_path = NULL;
1442 const char *update_path = path;
1445 if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0) ||
1446 (!opt->call_depth && would_lose_untracked(opt, path))) {
1447 update_path = alt_path = unique_path(opt, path, change_branch);
1450 if (opt->call_depth) {
1452 * We cannot arbitrarily accept either a_sha or b_sha as
1453 * correct; since there is no true "middle point" between
1454 * them, simply reuse the base version for virtual merge base.
1456 ret = remove_file_from_index(opt->repo->index, path);
1458 ret = update_file(opt, 0, o_oid, o_mode, update_path);
1461 * Despite the four nearly duplicate messages and argument
1462 * lists below and the ugliness of the nested if-statements,
1463 * having complete messages makes the job easier for
1466 * The slight variance among the cases is due to the fact
1468 * 1) directory/file conflicts (in effect if
1469 * !alt_path) could cause us to need to write the
1470 * file to a different path.
1471 * 2) renames (in effect if !old_path) could mean that
1472 * there are two names for the path that the user
1473 * may know the file by.
1477 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1478 "and %s in %s. Version %s of %s left in tree."),
1479 change, path, delete_branch, change_past,
1480 change_branch, change_branch, path);
1482 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1483 "and %s to %s in %s. Version %s of %s left in tree."),
1484 change, old_path, delete_branch, change_past, path,
1485 change_branch, change_branch, path);
1489 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1490 "and %s in %s. Version %s of %s left in tree at %s."),
1491 change, path, delete_branch, change_past,
1492 change_branch, change_branch, path, alt_path);
1494 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1495 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1496 change, old_path, delete_branch, change_past, path,
1497 change_branch, change_branch, path, alt_path);
1501 * No need to call update_file() on path when change_branch ==
1502 * opt->branch1 && !alt_path, since that would needlessly touch
1503 * path. We could call update_file_flags() with update_cache=0
1504 * and update_wd=0, but that's a no-op.
1506 if (change_branch != opt->branch1 || alt_path)
1507 ret = update_file(opt, 0, changed_oid, changed_mode, update_path);
1514 static int handle_rename_delete(struct merge_options *opt,
1515 struct diff_filepair *pair,
1516 const char *rename_branch,
1517 const char *delete_branch)
1519 const struct diff_filespec *orig = pair->one;
1520 const struct diff_filespec *dest = pair->two;
1522 if (handle_change_delete(opt,
1523 opt->call_depth ? orig->path : dest->path,
1524 opt->call_depth ? NULL : orig->path,
1525 &orig->oid, orig->mode,
1526 &dest->oid, dest->mode,
1527 rename_branch, delete_branch,
1528 _("rename"), _("renamed")))
1531 if (opt->call_depth)
1532 return remove_file_from_index(opt->repo->index, dest->path);
1534 return update_stages(opt, dest->path, NULL,
1535 rename_branch == opt->branch1 ? dest : NULL,
1536 rename_branch == opt->branch1 ? NULL : dest);
1539 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1540 struct stage_data *entry,
1543 struct object_id *oid = &entry->stages[stage].oid;
1544 unsigned mode = entry->stages[stage].mode;
1545 if (mode == 0 || is_null_oid(oid))
1547 oidcpy(&target->oid, oid);
1548 target->mode = mode;
1552 static int handle_file_collision(struct merge_options *opt,
1553 const char *collide_path,
1554 const char *prev_path1,
1555 const char *prev_path2,
1556 const char *branch1, const char *branch2,
1557 const struct object_id *a_oid,
1558 unsigned int a_mode,
1559 const struct object_id *b_oid,
1560 unsigned int b_mode)
1562 struct merge_file_info mfi;
1563 struct diff_filespec null, a, b;
1564 char *alt_path = NULL;
1565 const char *update_path = collide_path;
1568 * It's easiest to get the correct things into stage 2 and 3, and
1569 * to make sure that the content merge puts HEAD before the other
1570 * branch if we just ensure that branch1 == opt->branch1. So, simply
1571 * flip arguments around if we don't have that.
1573 if (branch1 != opt->branch1) {
1574 return handle_file_collision(opt, collide_path,
1575 prev_path2, prev_path1,
1582 * In the recursive case, we just opt to undo renames
1584 if (opt->call_depth && (prev_path1 || prev_path2)) {
1585 /* Put first file (a_oid, a_mode) in its original spot */
1587 if (update_file(opt, 1, a_oid, a_mode, prev_path1))
1590 if (update_file(opt, 1, a_oid, a_mode, collide_path))
1594 /* Put second file (b_oid, b_mode) in its original spot */
1596 if (update_file(opt, 1, b_oid, b_mode, prev_path2))
1599 if (update_file(opt, 1, b_oid, b_mode, collide_path))
1603 /* Don't leave something at collision path if unrenaming both */
1604 if (prev_path1 && prev_path2)
1605 remove_file(opt, 1, collide_path, 0);
1610 /* Remove rename sources if rename/add or rename/rename(2to1) */
1612 remove_file(opt, 1, prev_path1,
1613 opt->call_depth || would_lose_untracked(opt, prev_path1));
1615 remove_file(opt, 1, prev_path2,
1616 opt->call_depth || would_lose_untracked(opt, prev_path2));
1619 * Remove the collision path, if it wouldn't cause dirty contents
1620 * or an untracked file to get lost. We'll either overwrite with
1621 * merged contents, or just write out to differently named files.
1623 if (was_dirty(opt, collide_path)) {
1624 output(opt, 1, _("Refusing to lose dirty file at %s"),
1626 update_path = alt_path = unique_path(opt, collide_path, "merged");
1627 } else if (would_lose_untracked(opt, collide_path)) {
1629 * Only way we get here is if both renames were from
1630 * a directory rename AND user had an untracked file
1631 * at the location where both files end up after the
1632 * two directory renames. See testcase 10d of t6043.
1634 output(opt, 1, _("Refusing to lose untracked file at "
1635 "%s, even though it's in the way."),
1637 update_path = alt_path = unique_path(opt, collide_path, "merged");
1640 * FIXME: It's possible that the two files are identical
1641 * and that the current working copy happens to match, in
1642 * which case we are unnecessarily touching the working
1643 * tree file. It's not a likely enough scenario that I
1644 * want to code up the checks for it and a better fix is
1645 * available if we restructure how unpack_trees() and
1646 * merge-recursive interoperate anyway, so punting for
1649 remove_file(opt, 0, collide_path, 0);
1652 /* Store things in diff_filespecs for functions that need it */
1653 memset(&a, 0, sizeof(struct diff_filespec));
1654 memset(&b, 0, sizeof(struct diff_filespec));
1655 null.path = a.path = b.path = (char *)collide_path;
1656 oidcpy(&null.oid, &null_oid);
1658 oidcpy(&a.oid, a_oid);
1661 oidcpy(&b.oid, b_oid);
1665 if (merge_mode_and_contents(opt, &null, &a, &b, collide_path,
1666 branch1, branch2, opt->call_depth * 2, &mfi))
1668 mfi.clean &= !alt_path;
1669 if (update_file(opt, mfi.clean, &mfi.oid, mfi.mode, update_path))
1671 if (!mfi.clean && !opt->call_depth &&
1672 update_stages(opt, collide_path, NULL, &a, &b))
1676 * FIXME: If both a & b both started with conflicts (only possible
1677 * if they came from a rename/rename(2to1)), but had IDENTICAL
1678 * contents including those conflicts, then in the next line we claim
1679 * it was clean. If someone cares about this case, we should have the
1680 * caller notify us if we started with conflicts.
1685 static int handle_rename_add(struct merge_options *opt,
1686 struct rename_conflict_info *ci)
1688 /* a was renamed to c, and a separate c was added. */
1689 struct diff_filespec *a = ci->ren1->pair->one;
1690 struct diff_filespec *c = ci->ren1->pair->two;
1691 char *path = c->path;
1692 char *prev_path_desc;
1693 struct merge_file_info mfi;
1695 int other_stage = (ci->branch1 == opt->branch1 ? 3 : 2);
1697 output(opt, 1, _("CONFLICT (rename/add): "
1698 "Rename %s->%s in %s. Added %s in %s"),
1699 a->path, c->path, ci->branch1,
1700 c->path, ci->branch2);
1702 prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
1703 if (merge_mode_and_contents(opt, a, c, &ci->ren1_other, prev_path_desc,
1704 opt->branch1, opt->branch2,
1705 1 + opt->call_depth * 2, &mfi))
1707 free(prev_path_desc);
1709 return handle_file_collision(opt,
1710 c->path, a->path, NULL,
1711 ci->branch1, ci->branch2,
1713 &ci->ren1->dst_entry->stages[other_stage].oid,
1714 ci->ren1->dst_entry->stages[other_stage].mode);
1717 static char *find_path_for_conflict(struct merge_options *opt,
1719 const char *branch1,
1720 const char *branch2)
1722 char *new_path = NULL;
1723 if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0)) {
1724 new_path = unique_path(opt, path, branch1);
1725 output(opt, 1, _("%s is a directory in %s adding "
1727 path, branch2, new_path);
1728 } else if (would_lose_untracked(opt, path)) {
1729 new_path = unique_path(opt, path, branch1);
1730 output(opt, 1, _("Refusing to lose untracked file"
1731 " at %s; adding as %s instead"),
1738 static int handle_rename_rename_1to2(struct merge_options *opt,
1739 struct rename_conflict_info *ci)
1741 /* One file was renamed in both branches, but to different names. */
1742 struct merge_file_info mfi;
1743 struct diff_filespec other;
1744 struct diff_filespec *add;
1745 struct diff_filespec *o = ci->ren1->pair->one;
1746 struct diff_filespec *a = ci->ren1->pair->two;
1747 struct diff_filespec *b = ci->ren2->pair->two;
1750 output(opt, 1, _("CONFLICT (rename/rename): "
1751 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1752 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1753 o->path, a->path, ci->branch1,
1754 o->path, b->path, ci->branch2,
1755 opt->call_depth ? _(" (left unresolved)") : "");
1757 path_desc = xstrfmt("%s and %s, both renamed from %s",
1758 a->path, b->path, o->path);
1759 if (merge_mode_and_contents(opt, o, a, b, path_desc,
1760 ci->branch1, ci->branch2,
1761 opt->call_depth * 2, &mfi))
1765 if (opt->call_depth) {
1767 * FIXME: For rename/add-source conflicts (if we could detect
1768 * such), this is wrong. We should instead find a unique
1769 * pathname and then either rename the add-source file to that
1770 * unique path, or use that unique path instead of src here.
1772 if (update_file(opt, 0, &mfi.oid, mfi.mode, o->path))
1776 * Above, we put the merged content at the merge-base's
1777 * path. Now we usually need to delete both a->path and
1778 * b->path. However, the rename on each side of the merge
1779 * could also be involved in a rename/add conflict. In
1780 * such cases, we should keep the added file around,
1781 * resolving the conflict at that path in its favor.
1783 add = filespec_from_entry(&other, ci->ren1->dst_entry, 2 ^ 1);
1785 if (update_file(opt, 0, &add->oid, add->mode, a->path))
1789 remove_file_from_index(opt->repo->index, a->path);
1790 add = filespec_from_entry(&other, ci->ren2->dst_entry, 3 ^ 1);
1792 if (update_file(opt, 0, &add->oid, add->mode, b->path))
1796 remove_file_from_index(opt->repo->index, b->path);
1799 * For each destination path, we need to see if there is a
1800 * rename/add collision. If not, we can write the file out
1801 * to the specified location.
1803 add = filespec_from_entry(&other, ci->ren1->dst_entry, 2 ^ 1);
1805 if (handle_file_collision(opt, a->path,
1807 ci->branch1, ci->branch2,
1809 &add->oid, add->mode) < 0)
1812 char *new_path = find_path_for_conflict(opt, a->path,
1815 if (update_file(opt, 0, &mfi.oid, mfi.mode, new_path ? new_path : a->path))
1818 if (update_stages(opt, a->path, NULL, a, NULL))
1822 add = filespec_from_entry(&other, ci->ren2->dst_entry, 3 ^ 1);
1824 if (handle_file_collision(opt, b->path,
1826 ci->branch1, ci->branch2,
1827 &add->oid, add->mode,
1828 &mfi.oid, mfi.mode) < 0)
1831 char *new_path = find_path_for_conflict(opt, b->path,
1834 if (update_file(opt, 0, &mfi.oid, mfi.mode, new_path ? new_path : b->path))
1837 if (update_stages(opt, b->path, NULL, NULL, b))
1845 static int handle_rename_rename_2to1(struct merge_options *opt,
1846 struct rename_conflict_info *ci)
1848 /* Two files, a & b, were renamed to the same thing, c. */
1849 struct diff_filespec *a = ci->ren1->pair->one;
1850 struct diff_filespec *b = ci->ren2->pair->one;
1851 struct diff_filespec *c1 = ci->ren1->pair->two;
1852 struct diff_filespec *c2 = ci->ren2->pair->two;
1853 char *path = c1->path; /* == c2->path */
1854 char *path_side_1_desc;
1855 char *path_side_2_desc;
1856 struct merge_file_info mfi_c1;
1857 struct merge_file_info mfi_c2;
1859 output(opt, 1, _("CONFLICT (rename/rename): "
1860 "Rename %s->%s in %s. "
1861 "Rename %s->%s in %s"),
1862 a->path, c1->path, ci->branch1,
1863 b->path, c2->path, ci->branch2);
1865 path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
1866 path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
1867 if (merge_mode_and_contents(opt, a, c1, &ci->ren1_other, path_side_1_desc,
1868 opt->branch1, opt->branch2,
1869 1 + opt->call_depth * 2, &mfi_c1) ||
1870 merge_mode_and_contents(opt, b, &ci->ren2_other, c2, path_side_2_desc,
1871 opt->branch1, opt->branch2,
1872 1 + opt->call_depth * 2, &mfi_c2))
1874 free(path_side_1_desc);
1875 free(path_side_2_desc);
1877 return handle_file_collision(opt, path, a->path, b->path,
1878 ci->branch1, ci->branch2,
1879 &mfi_c1.oid, mfi_c1.mode,
1880 &mfi_c2.oid, mfi_c2.mode);
1884 * Get the diff_filepairs changed between o_tree and tree.
1886 static struct diff_queue_struct *get_diffpairs(struct merge_options *opt,
1887 struct tree *o_tree,
1890 struct diff_queue_struct *ret;
1891 struct diff_options opts;
1893 repo_diff_setup(opt->repo, &opts);
1894 opts.flags.recursive = 1;
1895 opts.flags.rename_empty = 0;
1896 opts.detect_rename = merge_detect_rename(opt);
1898 * We do not have logic to handle the detection of copies. In
1899 * fact, it may not even make sense to add such logic: would we
1900 * really want a change to a base file to be propagated through
1901 * multiple other files by a merge?
1903 if (opts.detect_rename > DIFF_DETECT_RENAME)
1904 opts.detect_rename = DIFF_DETECT_RENAME;
1905 opts.rename_limit = opt->merge_rename_limit >= 0 ? opt->merge_rename_limit :
1906 opt->diff_rename_limit >= 0 ? opt->diff_rename_limit :
1908 opts.rename_score = opt->rename_score;
1909 opts.show_rename_progress = opt->show_rename_progress;
1910 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1911 diff_setup_done(&opts);
1912 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1913 diffcore_std(&opts);
1914 if (opts.needed_rename_limit > opt->needed_rename_limit)
1915 opt->needed_rename_limit = opts.needed_rename_limit;
1917 ret = xmalloc(sizeof(*ret));
1918 *ret = diff_queued_diff;
1920 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1921 diff_queued_diff.nr = 0;
1922 diff_queued_diff.queue = NULL;
1927 static int tree_has_path(struct tree *tree, const char *path)
1929 struct object_id hashy;
1930 unsigned short mode_o;
1932 return !get_tree_entry(&tree->object.oid, path,
1937 * Return a new string that replaces the beginning portion (which matches
1938 * entry->dir), with entry->new_dir. In perl-speak:
1939 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1941 * Caller must ensure that old_path starts with entry->dir + '/'.
1943 static char *apply_dir_rename(struct dir_rename_entry *entry,
1944 const char *old_path)
1946 struct strbuf new_path = STRBUF_INIT;
1949 if (entry->non_unique_new_dir)
1952 oldlen = strlen(entry->dir);
1953 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
1954 strbuf_grow(&new_path, newlen);
1955 strbuf_addbuf(&new_path, &entry->new_dir);
1956 strbuf_addstr(&new_path, &old_path[oldlen]);
1958 return strbuf_detach(&new_path, NULL);
1961 static void get_renamed_dir_portion(const char *old_path, const char *new_path,
1962 char **old_dir, char **new_dir)
1964 char *end_of_old, *end_of_new;
1965 int old_len, new_len;
1972 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1973 * the "e/foo.c" part is the same, we just want to know that
1974 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1975 * so, for this example, this function returns "a/b/c/d" in
1976 * *old_dir and "a/b/some/thing/else" in *new_dir.
1978 * Also, if the basename of the file changed, we don't care. We
1979 * want to know which portion of the directory, if any, changed.
1981 end_of_old = strrchr(old_path, '/');
1982 end_of_new = strrchr(new_path, '/');
1984 if (end_of_old == NULL || end_of_new == NULL)
1986 while (*--end_of_new == *--end_of_old &&
1987 end_of_old != old_path &&
1988 end_of_new != new_path)
1989 ; /* Do nothing; all in the while loop */
1991 * We've found the first non-matching character in the directory
1992 * paths. That means the current directory we were comparing
1993 * represents the rename. Move end_of_old and end_of_new back
1994 * to the full directory name.
1996 if (*end_of_old == '/')
1998 if (*end_of_old != '/')
2000 end_of_old = strchr(end_of_old, '/');
2001 end_of_new = strchr(end_of_new, '/');
2004 * It may have been the case that old_path and new_path were the same
2005 * directory all along. Don't claim a rename if they're the same.
2007 old_len = end_of_old - old_path;
2008 new_len = end_of_new - new_path;
2010 if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
2011 *old_dir = xstrndup(old_path, old_len);
2012 *new_dir = xstrndup(new_path, new_len);
2016 static void remove_hashmap_entries(struct hashmap *dir_renames,
2017 struct string_list *items_to_remove)
2020 struct dir_rename_entry *entry;
2022 for (i = 0; i < items_to_remove->nr; i++) {
2023 entry = items_to_remove->items[i].util;
2024 hashmap_remove(dir_renames, entry, NULL);
2026 string_list_clear(items_to_remove, 0);
2030 * See if there is a directory rename for path, and if there are any file
2031 * level conflicts for the renamed location. If there is a rename and
2032 * there are no conflicts, return the new name. Otherwise, return NULL.
2034 static char *handle_path_level_conflicts(struct merge_options *opt,
2036 struct dir_rename_entry *entry,
2037 struct hashmap *collisions,
2040 char *new_path = NULL;
2041 struct collision_entry *collision_ent;
2043 struct strbuf collision_paths = STRBUF_INIT;
2046 * entry has the mapping of old directory name to new directory name
2047 * that we want to apply to path.
2049 new_path = apply_dir_rename(entry, path);
2052 /* This should only happen when entry->non_unique_new_dir set */
2053 if (!entry->non_unique_new_dir)
2054 BUG("entry->non_unqiue_dir not set and !new_path");
2055 output(opt, 1, _("CONFLICT (directory rename split): "
2056 "Unclear where to place %s because directory "
2057 "%s was renamed to multiple other directories, "
2058 "with no destination getting a majority of the "
2066 * The caller needs to have ensured that it has pre-populated
2067 * collisions with all paths that map to new_path. Do a quick check
2068 * to ensure that's the case.
2070 collision_ent = collision_find_entry(collisions, new_path);
2071 if (collision_ent == NULL)
2072 BUG("collision_ent is NULL");
2075 * Check for one-sided add/add/.../add conflicts, i.e.
2076 * where implicit renames from the other side doing
2077 * directory rename(s) can affect this side of history
2078 * to put multiple paths into the same location. Warn
2079 * and bail on directory renames for such paths.
2081 if (collision_ent->reported_already) {
2083 } else if (tree_has_path(tree, new_path)) {
2084 collision_ent->reported_already = 1;
2085 strbuf_add_separated_string_list(&collision_paths, ", ",
2086 &collision_ent->source_files);
2087 output(opt, 1, _("CONFLICT (implicit dir rename): Existing "
2088 "file/dir at %s in the way of implicit "
2089 "directory rename(s) putting the following "
2090 "path(s) there: %s."),
2091 new_path, collision_paths.buf);
2093 } else if (collision_ent->source_files.nr > 1) {
2094 collision_ent->reported_already = 1;
2095 strbuf_add_separated_string_list(&collision_paths, ", ",
2096 &collision_ent->source_files);
2097 output(opt, 1, _("CONFLICT (implicit dir rename): Cannot map "
2098 "more than one path to %s; implicit directory "
2099 "renames tried to put these paths there: %s"),
2100 new_path, collision_paths.buf);
2104 /* Free memory we no longer need */
2105 strbuf_release(&collision_paths);
2106 if (!clean && new_path) {
2115 * There are a couple things we want to do at the directory level:
2116 * 1. Check for both sides renaming to the same thing, in order to avoid
2117 * implicit renaming of files that should be left in place. (See
2118 * testcase 6b in t6043 for details.)
2119 * 2. Prune directory renames if there are still files left in the
2120 * the original directory. These represent a partial directory rename,
2121 * i.e. a rename where only some of the files within the directory
2122 * were renamed elsewhere. (Technically, this could be done earlier
2123 * in get_directory_renames(), except that would prevent us from
2124 * doing the previous check and thus failing testcase 6b.)
2125 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2126 * In the future, we could potentially record this info as well and
2127 * omit reporting rename/rename(1to2) conflicts for each path within
2128 * the affected directories, thus cleaning up the merge output.
2129 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2130 * directory level, because merging directories is fine. If it
2131 * causes conflicts for files within those merged directories, then
2132 * that should be detected at the individual path level.
2134 static void handle_directory_level_conflicts(struct merge_options *opt,
2135 struct hashmap *dir_re_head,
2137 struct hashmap *dir_re_merge,
2140 struct hashmap_iter iter;
2141 struct dir_rename_entry *head_ent;
2142 struct dir_rename_entry *merge_ent;
2144 struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
2145 struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
2147 hashmap_iter_init(dir_re_head, &iter);
2148 while ((head_ent = hashmap_iter_next(&iter))) {
2149 merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
2151 !head_ent->non_unique_new_dir &&
2152 !merge_ent->non_unique_new_dir &&
2153 !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
2154 /* 1. Renamed identically; remove it from both sides */
2155 string_list_append(&remove_from_head,
2156 head_ent->dir)->util = head_ent;
2157 strbuf_release(&head_ent->new_dir);
2158 string_list_append(&remove_from_merge,
2159 merge_ent->dir)->util = merge_ent;
2160 strbuf_release(&merge_ent->new_dir);
2161 } else if (tree_has_path(head, head_ent->dir)) {
2162 /* 2. This wasn't a directory rename after all */
2163 string_list_append(&remove_from_head,
2164 head_ent->dir)->util = head_ent;
2165 strbuf_release(&head_ent->new_dir);
2169 remove_hashmap_entries(dir_re_head, &remove_from_head);
2170 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2172 hashmap_iter_init(dir_re_merge, &iter);
2173 while ((merge_ent = hashmap_iter_next(&iter))) {
2174 head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
2175 if (tree_has_path(merge, merge_ent->dir)) {
2176 /* 2. This wasn't a directory rename after all */
2177 string_list_append(&remove_from_merge,
2178 merge_ent->dir)->util = merge_ent;
2179 } else if (head_ent &&
2180 !head_ent->non_unique_new_dir &&
2181 !merge_ent->non_unique_new_dir) {
2182 /* 3. rename/rename(1to2) */
2184 * We can assume it's not rename/rename(1to1) because
2185 * that was case (1), already checked above. So we
2186 * know that head_ent->new_dir and merge_ent->new_dir
2187 * are different strings.
2189 output(opt, 1, _("CONFLICT (rename/rename): "
2190 "Rename directory %s->%s in %s. "
2191 "Rename directory %s->%s in %s"),
2192 head_ent->dir, head_ent->new_dir.buf, opt->branch1,
2193 head_ent->dir, merge_ent->new_dir.buf, opt->branch2);
2194 string_list_append(&remove_from_head,
2195 head_ent->dir)->util = head_ent;
2196 strbuf_release(&head_ent->new_dir);
2197 string_list_append(&remove_from_merge,
2198 merge_ent->dir)->util = merge_ent;
2199 strbuf_release(&merge_ent->new_dir);
2203 remove_hashmap_entries(dir_re_head, &remove_from_head);
2204 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2207 static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
2209 struct hashmap *dir_renames;
2210 struct hashmap_iter iter;
2211 struct dir_rename_entry *entry;
2215 * Typically, we think of a directory rename as all files from a
2216 * certain directory being moved to a target directory. However,
2217 * what if someone first moved two files from the original
2218 * directory in one commit, and then renamed the directory
2219 * somewhere else in a later commit? At merge time, we just know
2220 * that files from the original directory went to two different
2221 * places, and that the bulk of them ended up in the same place.
2222 * We want each directory rename to represent where the bulk of the
2223 * files from that directory end up; this function exists to find
2224 * where the bulk of the files went.
2226 * The first loop below simply iterates through the list of file
2227 * renames, finding out how often each directory rename pair
2228 * possibility occurs.
2230 dir_renames = xmalloc(sizeof(*dir_renames));
2231 dir_rename_init(dir_renames);
2232 for (i = 0; i < pairs->nr; ++i) {
2233 struct string_list_item *item;
2235 struct diff_filepair *pair = pairs->queue[i];
2236 char *old_dir, *new_dir;
2238 /* File not part of directory rename if it wasn't renamed */
2239 if (pair->status != 'R')
2242 get_renamed_dir_portion(pair->one->path, pair->two->path,
2243 &old_dir, &new_dir);
2245 /* Directory didn't change at all; ignore this one. */
2248 entry = dir_rename_find_entry(dir_renames, old_dir);
2250 entry = xmalloc(sizeof(*entry));
2251 dir_rename_entry_init(entry, old_dir);
2252 hashmap_put(dir_renames, entry);
2256 item = string_list_lookup(&entry->possible_new_dirs, new_dir);
2258 item = string_list_insert(&entry->possible_new_dirs,
2260 item->util = xcalloc(1, sizeof(int));
2269 * For each directory with files moved out of it, we find out which
2270 * target directory received the most files so we can declare it to
2271 * be the "winning" target location for the directory rename. This
2272 * winner gets recorded in new_dir. If there is no winner
2273 * (multiple target directories received the same number of files),
2274 * we set non_unique_new_dir. Once we've determined the winner (or
2275 * that there is no winner), we no longer need possible_new_dirs.
2277 hashmap_iter_init(dir_renames, &iter);
2278 while ((entry = hashmap_iter_next(&iter))) {
2283 for (i = 0; i < entry->possible_new_dirs.nr; i++) {
2284 int *count = entry->possible_new_dirs.items[i].util;
2288 else if (*count > max) {
2290 best = entry->possible_new_dirs.items[i].string;
2294 entry->non_unique_new_dir = 1;
2296 assert(entry->new_dir.len == 0);
2297 strbuf_addstr(&entry->new_dir, best);
2300 * The relevant directory sub-portion of the original full
2301 * filepaths were xstrndup'ed before inserting into
2302 * possible_new_dirs, and instead of manually iterating the
2303 * list and free'ing each, just lie and tell
2304 * possible_new_dirs that it did the strdup'ing so that it
2305 * will free them for us.
2307 entry->possible_new_dirs.strdup_strings = 1;
2308 string_list_clear(&entry->possible_new_dirs, 1);
2314 static struct dir_rename_entry *check_dir_renamed(const char *path,
2315 struct hashmap *dir_renames)
2317 char *temp = xstrdup(path);
2319 struct dir_rename_entry *entry = NULL;
2321 while ((end = strrchr(temp, '/'))) {
2323 entry = dir_rename_find_entry(dir_renames, temp);
2331 static void compute_collisions(struct hashmap *collisions,
2332 struct hashmap *dir_renames,
2333 struct diff_queue_struct *pairs)
2338 * Multiple files can be mapped to the same path due to directory
2339 * renames done by the other side of history. Since that other
2340 * side of history could have merged multiple directories into one,
2341 * if our side of history added the same file basename to each of
2342 * those directories, then all N of them would get implicitly
2343 * renamed by the directory rename detection into the same path,
2344 * and we'd get an add/add/.../add conflict, and all those adds
2345 * from *this* side of history. This is not representable in the
2346 * index, and users aren't going to easily be able to make sense of
2347 * it. So we need to provide a good warning about what's
2348 * happening, and fall back to no-directory-rename detection
2349 * behavior for those paths.
2351 * See testcases 9e and all of section 5 from t6043 for examples.
2353 collision_init(collisions);
2355 for (i = 0; i < pairs->nr; ++i) {
2356 struct dir_rename_entry *dir_rename_ent;
2357 struct collision_entry *collision_ent;
2359 struct diff_filepair *pair = pairs->queue[i];
2361 if (pair->status != 'A' && pair->status != 'R')
2363 dir_rename_ent = check_dir_renamed(pair->two->path,
2365 if (!dir_rename_ent)
2368 new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
2371 * dir_rename_ent->non_unique_new_path is true, which
2372 * means there is no directory rename for us to use,
2373 * which means it won't cause us any additional
2377 collision_ent = collision_find_entry(collisions, new_path);
2378 if (!collision_ent) {
2379 collision_ent = xcalloc(1,
2380 sizeof(struct collision_entry));
2381 hashmap_entry_init(collision_ent, strhash(new_path));
2382 hashmap_put(collisions, collision_ent);
2383 collision_ent->target_file = new_path;
2387 string_list_insert(&collision_ent->source_files,
2392 static char *check_for_directory_rename(struct merge_options *opt,
2395 struct hashmap *dir_renames,
2396 struct hashmap *dir_rename_exclusions,
2397 struct hashmap *collisions,
2400 char *new_path = NULL;
2401 struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames);
2402 struct dir_rename_entry *oentry = NULL;
2408 * This next part is a little weird. We do not want to do an
2409 * implicit rename into a directory we renamed on our side, because
2410 * that will result in a spurious rename/rename(1to2) conflict. An
2412 * Base commit: dumbdir/afile, otherdir/bfile
2413 * Side 1: smrtdir/afile, otherdir/bfile
2414 * Side 2: dumbdir/afile, dumbdir/bfile
2415 * Here, while working on Side 1, we could notice that otherdir was
2416 * renamed/merged to dumbdir, and change the diff_filepair for
2417 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2418 * 2 will notice the rename from dumbdir to smrtdir, and do the
2419 * transitive rename to move it from dumbdir/bfile to
2420 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2421 * smrtdir, a rename/rename(1to2) conflict. We really just want
2422 * the file to end up in smrtdir. And the way to achieve that is
2423 * to not let Side1 do the rename to dumbdir, since we know that is
2424 * the source of one of our directory renames.
2426 * That's why oentry and dir_rename_exclusions is here.
2428 * As it turns out, this also prevents N-way transient rename
2429 * confusion; See testcases 9c and 9d of t6043.
2431 oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
2433 output(opt, 1, _("WARNING: Avoiding applying %s -> %s rename "
2434 "to %s, because %s itself was renamed."),
2435 entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
2437 new_path = handle_path_level_conflicts(opt, path, entry,
2439 *clean_merge &= (new_path != NULL);
2445 static void apply_directory_rename_modifications(struct merge_options *opt,
2446 struct diff_filepair *pair,
2450 struct tree *o_tree,
2451 struct tree *a_tree,
2452 struct tree *b_tree,
2453 struct string_list *entries)
2455 struct string_list_item *item;
2456 int stage = (tree == a_tree ? 2 : 3);
2460 * In all cases where we can do directory rename detection,
2461 * unpack_trees() will have read pair->two->path into the
2462 * index and the working copy. We need to remove it so that
2463 * we can instead place it at new_path. It is guaranteed to
2464 * not be untracked (unpack_trees() would have errored out
2465 * saying the file would have been overwritten), but it might
2468 update_wd = !was_dirty(opt, pair->two->path);
2470 output(opt, 1, _("Refusing to lose dirty file at %s"),
2472 remove_file(opt, 1, pair->two->path, !update_wd);
2474 /* Find or create a new re->dst_entry */
2475 item = string_list_lookup(entries, new_path);
2478 * Since we're renaming on this side of history, and it's
2479 * due to a directory rename on the other side of history
2480 * (which we only allow when the directory in question no
2481 * longer exists on the other side of history), the
2482 * original entry for re->dst_entry is no longer
2485 re->dst_entry->processed = 1;
2488 * ...because we'll be using this new one.
2490 re->dst_entry = item->util;
2493 * re->dst_entry is for the before-dir-rename path, and we
2494 * need it to hold information for the after-dir-rename
2495 * path. Before creating a new entry, we need to mark the
2496 * old one as unnecessary (...unless it is shared by
2497 * src_entry, i.e. this didn't use to be a rename, in which
2498 * case we can just allow the normal processing to happen
2501 if (pair->status == 'R')
2502 re->dst_entry->processed = 1;
2504 re->dst_entry = insert_stage_data(new_path,
2505 o_tree, a_tree, b_tree,
2507 item = string_list_insert(entries, new_path);
2508 item->util = re->dst_entry;
2512 * Update the stage_data with the information about the path we are
2513 * moving into place. That slot will be empty and available for us
2514 * to write to because of the collision checks in
2515 * handle_path_level_conflicts(). In other words,
2516 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2517 * open for us to write to.
2519 * It may be tempting to actually update the index at this point as
2520 * well, using update_stages_for_stage_data(), but as per the big
2521 * "NOTE" in update_stages(), doing so will modify the current
2522 * in-memory index which will break calls to would_lose_untracked()
2523 * that we need to make. Instead, we need to just make sure that
2524 * the various handle_rename_*() functions update the index
2525 * explicitly rather than relying on unpack_trees() to have done it.
2527 get_tree_entry(&tree->object.oid,
2529 &re->dst_entry->stages[stage].oid,
2530 &re->dst_entry->stages[stage].mode);
2532 /* Update pair status */
2533 if (pair->status == 'A') {
2535 * Recording rename information for this add makes it look
2536 * like a rename/delete conflict. Make sure we can
2537 * correctly handle this as an add that was moved to a new
2538 * directory instead of reporting a rename/delete conflict.
2540 re->add_turned_into_rename = 1;
2543 * We don't actually look at pair->status again, but it seems
2544 * pedagogically correct to adjust it.
2549 * Finally, record the new location.
2551 pair->two->path = new_path;
2555 * Get information of all renames which occurred in 'pairs', making use of
2556 * any implicit directory renames inferred from the other side of history.
2557 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2558 * to be able to associate the correct cache entries with the rename
2559 * information; tree is always equal to either a_tree or b_tree.
2561 static struct string_list *get_renames(struct merge_options *opt,
2562 struct diff_queue_struct *pairs,
2563 struct hashmap *dir_renames,
2564 struct hashmap *dir_rename_exclusions,
2566 struct tree *o_tree,
2567 struct tree *a_tree,
2568 struct tree *b_tree,
2569 struct string_list *entries,
2573 struct hashmap collisions;
2574 struct hashmap_iter iter;
2575 struct collision_entry *e;
2576 struct string_list *renames;
2578 compute_collisions(&collisions, dir_renames, pairs);
2579 renames = xcalloc(1, sizeof(struct string_list));
2581 for (i = 0; i < pairs->nr; ++i) {
2582 struct string_list_item *item;
2584 struct diff_filepair *pair = pairs->queue[i];
2585 char *new_path; /* non-NULL only with directory renames */
2587 if (pair->status != 'A' && pair->status != 'R') {
2588 diff_free_filepair(pair);
2591 new_path = check_for_directory_rename(opt, pair->two->path, tree,
2593 dir_rename_exclusions,
2596 if (pair->status != 'R' && !new_path) {
2597 diff_free_filepair(pair);
2601 re = xmalloc(sizeof(*re));
2603 re->add_turned_into_rename = 0;
2605 item = string_list_lookup(entries, re->pair->one->path);
2607 re->src_entry = insert_stage_data(re->pair->one->path,
2608 o_tree, a_tree, b_tree, entries);
2610 re->src_entry = item->util;
2612 item = string_list_lookup(entries, re->pair->two->path);
2614 re->dst_entry = insert_stage_data(re->pair->two->path,
2615 o_tree, a_tree, b_tree, entries);
2617 re->dst_entry = item->util;
2618 item = string_list_insert(renames, pair->one->path);
2621 apply_directory_rename_modifications(opt, pair, new_path,
2627 hashmap_iter_init(&collisions, &iter);
2628 while ((e = hashmap_iter_next(&iter))) {
2629 free(e->target_file);
2630 string_list_clear(&e->source_files, 0);
2632 hashmap_free(&collisions, 1);
2636 static int process_renames(struct merge_options *opt,
2637 struct string_list *a_renames,
2638 struct string_list *b_renames)
2640 int clean_merge = 1, i, j;
2641 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
2642 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
2643 const struct rename *sre;
2645 for (i = 0; i < a_renames->nr; i++) {
2646 sre = a_renames->items[i].util;
2647 string_list_insert(&a_by_dst, sre->pair->two->path)->util
2650 for (i = 0; i < b_renames->nr; i++) {
2651 sre = b_renames->items[i].util;
2652 string_list_insert(&b_by_dst, sre->pair->two->path)->util
2656 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
2657 struct string_list *renames1, *renames2Dst;
2658 struct rename *ren1 = NULL, *ren2 = NULL;
2659 const char *branch1, *branch2;
2660 const char *ren1_src, *ren1_dst;
2661 struct string_list_item *lookup;
2663 if (i >= a_renames->nr) {
2664 ren2 = b_renames->items[j++].util;
2665 } else if (j >= b_renames->nr) {
2666 ren1 = a_renames->items[i++].util;
2668 int compare = strcmp(a_renames->items[i].string,
2669 b_renames->items[j].string);
2671 ren1 = a_renames->items[i++].util;
2673 ren2 = b_renames->items[j++].util;
2676 /* TODO: refactor, so that 1/2 are not needed */
2678 renames1 = a_renames;
2679 renames2Dst = &b_by_dst;
2680 branch1 = opt->branch1;
2681 branch2 = opt->branch2;
2683 renames1 = b_renames;
2684 renames2Dst = &a_by_dst;
2685 branch1 = opt->branch2;
2686 branch2 = opt->branch1;
2690 if (ren1->processed)
2692 ren1->processed = 1;
2693 ren1->dst_entry->processed = 1;
2694 /* BUG: We should only mark src_entry as processed if we
2695 * are not dealing with a rename + add-source case.
2697 ren1->src_entry->processed = 1;
2699 ren1_src = ren1->pair->one->path;
2700 ren1_dst = ren1->pair->two->path;
2703 /* One file renamed on both sides */
2704 const char *ren2_src = ren2->pair->one->path;
2705 const char *ren2_dst = ren2->pair->two->path;
2706 enum rename_type rename_type;
2707 if (strcmp(ren1_src, ren2_src) != 0)
2708 BUG("ren1_src != ren2_src");
2709 ren2->dst_entry->processed = 1;
2710 ren2->processed = 1;
2711 if (strcmp(ren1_dst, ren2_dst) != 0) {
2712 rename_type = RENAME_ONE_FILE_TO_TWO;
2715 rename_type = RENAME_ONE_FILE_TO_ONE;
2716 /* BUG: We should only remove ren1_src in
2717 * the base stage (think of rename +
2718 * add-source cases).
2720 remove_file(opt, 1, ren1_src, 1);
2721 update_entry(ren1->dst_entry,
2726 setup_rename_conflict_info(rename_type,
2734 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
2735 /* Two different files renamed to the same thing */
2737 ren2 = lookup->util;
2738 ren2_dst = ren2->pair->two->path;
2739 if (strcmp(ren1_dst, ren2_dst) != 0)
2740 BUG("ren1_dst != ren2_dst");
2743 ren2->processed = 1;
2745 * BUG: We should only mark src_entry as processed
2746 * if we are not dealing with a rename + add-source
2749 ren2->src_entry->processed = 1;
2751 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
2761 /* Renamed in 1, maybe changed in 2 */
2762 /* we only use sha1 and mode of these */
2763 struct diff_filespec src_other, dst_other;
2767 * unpack_trees loads entries from common-commit
2768 * into stage 1, from head-commit into stage 2, and
2769 * from merge-commit into stage 3. We keep track
2770 * of which side corresponds to the rename.
2772 int renamed_stage = a_renames == renames1 ? 2 : 3;
2773 int other_stage = a_renames == renames1 ? 3 : 2;
2775 /* BUG: We should only remove ren1_src in the base
2776 * stage and in other_stage (think of rename +
2779 remove_file(opt, 1, ren1_src,
2780 renamed_stage == 2 || !was_tracked(opt, ren1_src));
2782 oidcpy(&src_other.oid,
2783 &ren1->src_entry->stages[other_stage].oid);
2784 src_other.mode = ren1->src_entry->stages[other_stage].mode;
2785 oidcpy(&dst_other.oid,
2786 &ren1->dst_entry->stages[other_stage].oid);
2787 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
2790 if (oid_eq(&src_other.oid, &null_oid) &&
2791 ren1->add_turned_into_rename) {
2792 setup_rename_conflict_info(RENAME_VIA_DIR,
2800 } else if (oid_eq(&src_other.oid, &null_oid)) {
2801 setup_rename_conflict_info(RENAME_DELETE,
2809 } else if ((dst_other.mode == ren1->pair->two->mode) &&
2810 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
2812 * Added file on the other side identical to
2813 * the file being renamed: clean merge.
2814 * Also, there is no need to overwrite the
2815 * file already in the working copy, so call
2816 * update_file_flags() instead of
2819 if (update_file_flags(opt,
2820 &ren1->pair->two->oid,
2821 ren1->pair->two->mode,
2823 1, /* update_cache */
2826 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
2828 * Probably not a clean merge, but it's
2829 * premature to set clean_merge to 0 here,
2830 * because if the rename merges cleanly and
2831 * the merge exactly matches the newly added
2832 * file, then the merge will be clean.
2834 setup_rename_conflict_info(RENAME_ADD,
2845 if (clean_merge < 0)
2846 goto cleanup_and_return;
2848 struct diff_filespec *o, *a, *b;
2849 src_other.path = (char *)ren1_src;
2851 o = ren1->pair->one;
2852 if (a_renames == renames1) {
2853 a = ren1->pair->two;
2856 b = ren1->pair->two;
2859 update_entry(ren1->dst_entry, o, a, b);
2860 setup_rename_conflict_info(RENAME_NORMAL,
2872 string_list_clear(&a_by_dst, 0);
2873 string_list_clear(&b_by_dst, 0);
2878 struct rename_info {
2879 struct string_list *head_renames;
2880 struct string_list *merge_renames;
2883 static void initial_cleanup_rename(struct diff_queue_struct *pairs,
2884 struct hashmap *dir_renames)
2886 struct hashmap_iter iter;
2887 struct dir_rename_entry *e;
2889 hashmap_iter_init(dir_renames, &iter);
2890 while ((e = hashmap_iter_next(&iter))) {
2892 strbuf_release(&e->new_dir);
2893 /* possible_new_dirs already cleared in get_directory_renames */
2895 hashmap_free(dir_renames, 1);
2902 static int detect_and_process_renames(struct merge_options *opt,
2903 struct tree *common,
2906 struct string_list *entries,
2907 struct rename_info *ri)
2909 struct diff_queue_struct *head_pairs, *merge_pairs;
2910 struct hashmap *dir_re_head, *dir_re_merge;
2913 ri->head_renames = NULL;
2914 ri->merge_renames = NULL;
2916 if (!merge_detect_rename(opt))
2919 head_pairs = get_diffpairs(opt, common, head);
2920 merge_pairs = get_diffpairs(opt, common, merge);
2922 if (opt->detect_directory_renames) {
2923 dir_re_head = get_directory_renames(head_pairs);
2924 dir_re_merge = get_directory_renames(merge_pairs);
2926 handle_directory_level_conflicts(opt,
2928 dir_re_merge, merge);
2930 dir_re_head = xmalloc(sizeof(*dir_re_head));
2931 dir_re_merge = xmalloc(sizeof(*dir_re_merge));
2932 dir_rename_init(dir_re_head);
2933 dir_rename_init(dir_re_merge);
2936 ri->head_renames = get_renames(opt, head_pairs,
2937 dir_re_merge, dir_re_head, head,
2938 common, head, merge, entries,
2942 ri->merge_renames = get_renames(opt, merge_pairs,
2943 dir_re_head, dir_re_merge, merge,
2944 common, head, merge, entries,
2948 clean &= process_renames(opt, ri->head_renames, ri->merge_renames);
2952 * Some cleanup is deferred until cleanup_renames() because the
2953 * data structures are still needed and referenced in
2954 * process_entry(). But there are a few things we can free now.
2956 initial_cleanup_rename(head_pairs, dir_re_head);
2957 initial_cleanup_rename(merge_pairs, dir_re_merge);
2962 static void final_cleanup_rename(struct string_list *rename)
2964 const struct rename *re;
2970 for (i = 0; i < rename->nr; i++) {
2971 re = rename->items[i].util;
2972 diff_free_filepair(re->pair);
2974 string_list_clear(rename, 1);
2978 static void final_cleanup_renames(struct rename_info *re_info)
2980 final_cleanup_rename(re_info->head_renames);
2981 final_cleanup_rename(re_info->merge_renames);
2984 static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
2986 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
2989 static int read_oid_strbuf(struct merge_options *opt,
2990 const struct object_id *oid,
2994 enum object_type type;
2996 buf = read_object_file(oid, &type, &size);
2998 return err(opt, _("cannot read object %s"), oid_to_hex(oid));
2999 if (type != OBJ_BLOB) {
3001 return err(opt, _("object %s is not a blob"), oid_to_hex(oid));
3003 strbuf_attach(dst, buf, size, size + 1);
3007 static int blob_unchanged(struct merge_options *opt,
3008 const struct object_id *o_oid,
3010 const struct object_id *a_oid,
3012 int renormalize, const char *path)
3014 struct strbuf obuf = STRBUF_INIT;
3015 struct strbuf abuf = STRBUF_INIT;
3016 int ret = 0; /* assume changed for safety */
3017 const struct index_state *idx = opt->repo->index;
3019 if (a_mode != o_mode)
3021 if (oid_eq(o_oid, a_oid))
3026 assert(o_oid && a_oid);
3027 if (read_oid_strbuf(opt, o_oid, &obuf) ||
3028 read_oid_strbuf(opt, a_oid, &abuf))
3031 * Note: binary | is used so that both renormalizations are
3032 * performed. Comparison can be skipped if both files are
3033 * unchanged since their sha1s have already been compared.
3035 if (renormalize_buffer(idx, path, obuf.buf, obuf.len, &obuf) |
3036 renormalize_buffer(idx, path, abuf.buf, abuf.len, &abuf))
3037 ret = (obuf.len == abuf.len && !memcmp(obuf.buf, abuf.buf, obuf.len));
3040 strbuf_release(&obuf);
3041 strbuf_release(&abuf);
3045 static int handle_modify_delete(struct merge_options *opt,
3047 struct object_id *o_oid, int o_mode,
3048 struct object_id *a_oid, int a_mode,
3049 struct object_id *b_oid, int b_mode)
3051 const char *modify_branch, *delete_branch;
3052 struct object_id *changed_oid;
3056 modify_branch = opt->branch1;
3057 delete_branch = opt->branch2;
3058 changed_oid = a_oid;
3059 changed_mode = a_mode;
3061 modify_branch = opt->branch2;
3062 delete_branch = opt->branch1;
3063 changed_oid = b_oid;
3064 changed_mode = b_mode;
3067 return handle_change_delete(opt,
3070 changed_oid, changed_mode,
3071 modify_branch, delete_branch,
3072 _("modify"), _("modified"));
3075 static int handle_content_merge(struct merge_options *opt,
3078 struct object_id *o_oid, int o_mode,
3079 struct object_id *a_oid, int a_mode,
3080 struct object_id *b_oid, int b_mode,
3081 struct rename_conflict_info *ci)
3083 const char *reason = _("content");
3084 const char *path1 = NULL, *path2 = NULL;
3085 struct merge_file_info mfi;
3086 struct diff_filespec one, a, b;
3087 unsigned df_conflict_remains = 0;
3090 reason = _("add/add");
3091 o_oid = (struct object_id *)&null_oid;
3093 one.path = a.path = b.path = (char *)path;
3094 oidcpy(&one.oid, o_oid);
3096 oidcpy(&a.oid, a_oid);
3098 oidcpy(&b.oid, b_oid);
3102 struct diff_filepair *pair1 = ci->ren1->pair;
3104 path1 = (opt->branch1 == ci->branch1) ?
3105 pair1->two->path : pair1->one->path;
3106 /* If ci->ren2->pair != NULL, we are in
3107 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3110 path2 = ((ci->ren2 && ci->ren2->pair) ||
3111 opt->branch2 == ci->branch1) ?
3112 pair1->two->path : pair1->one->path;
3113 one.path = pair1->one->path;
3114 a.path = (char *)path1;
3115 b.path = (char *)path2;
3117 if (dir_in_way(opt->repo->index, path, !opt->call_depth,
3118 S_ISGITLINK(pair1->two->mode)))
3119 df_conflict_remains = 1;
3121 if (merge_mode_and_contents(opt, &one, &a, &b, path,
3122 opt->branch1, opt->branch2,
3123 opt->call_depth * 2, &mfi))
3127 * We can skip updating the working tree file iff:
3128 * a) The merge is clean
3129 * b) The merge matches what was in HEAD (content, mode, pathname)
3130 * c) The target path is usable (i.e. not involved in D/F conflict)
3133 was_tracked_and_matches(opt, path, &mfi.oid, mfi.mode) &&
3134 !df_conflict_remains) {
3136 struct cache_entry *ce;
3138 output(opt, 3, _("Skipped %s (merged same as existing)"), path);
3139 if (add_cacheinfo(opt, mfi.mode, &mfi.oid, path,
3140 0, (!opt->call_depth && !is_dirty), 0))
3143 * However, add_cacheinfo() will delete the old cache entry
3144 * and add a new one. We need to copy over any skip_worktree
3145 * flag to avoid making the file appear as if it were
3146 * deleted by the user.
3148 pos = index_name_pos(&opt->orig_index, path, strlen(path));
3149 ce = opt->orig_index.cache[pos];
3150 if (ce_skip_worktree(ce)) {
3151 pos = index_name_pos(opt->repo->index, path, strlen(path));
3152 ce = opt->repo->index->cache[pos];
3153 ce->ce_flags |= CE_SKIP_WORKTREE;
3159 if (S_ISGITLINK(mfi.mode))
3160 reason = _("submodule");
3161 output(opt, 1, _("CONFLICT (%s): Merge conflict in %s"),
3163 if (ci && !df_conflict_remains)
3164 if (update_stages(opt, path, &one, &a, &b))
3168 if (df_conflict_remains || is_dirty) {
3170 if (opt->call_depth) {
3171 remove_file_from_index(opt->repo->index, path);
3174 if (update_stages(opt, path, &one, &a, &b))
3177 int file_from_stage2 = was_tracked(opt, path);
3178 struct diff_filespec merged;
3179 oidcpy(&merged.oid, &mfi.oid);
3180 merged.mode = mfi.mode;
3182 if (update_stages(opt, path, NULL,
3183 file_from_stage2 ? &merged : NULL,
3184 file_from_stage2 ? NULL : &merged))
3189 new_path = unique_path(opt, path, ci->branch1);
3191 output(opt, 1, _("Refusing to lose dirty file at %s"),
3194 output(opt, 1, _("Adding as %s instead"), new_path);
3195 if (update_file(opt, 0, &mfi.oid, mfi.mode, new_path)) {
3201 } else if (update_file(opt, mfi.clean, &mfi.oid, mfi.mode, path))
3203 return !is_dirty && mfi.clean;
3206 static int handle_rename_normal(struct merge_options *opt,
3208 struct object_id *o_oid, unsigned int o_mode,
3209 struct object_id *a_oid, unsigned int a_mode,
3210 struct object_id *b_oid, unsigned int b_mode,
3211 struct rename_conflict_info *ci)
3213 /* Merge the content and write it out */
3214 return handle_content_merge(opt, path, was_dirty(opt, path),
3215 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
3219 /* Per entry merge function */
3220 static int process_entry(struct merge_options *opt,
3221 const char *path, struct stage_data *entry)
3223 int clean_merge = 1;
3224 int normalize = opt->renormalize;
3225 unsigned o_mode = entry->stages[1].mode;
3226 unsigned a_mode = entry->stages[2].mode;
3227 unsigned b_mode = entry->stages[3].mode;
3228 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
3229 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
3230 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
3232 entry->processed = 1;
3233 if (entry->rename_conflict_info) {
3234 struct rename_conflict_info *ci = entry->rename_conflict_info;
3235 switch (ci->rename_type) {
3237 case RENAME_ONE_FILE_TO_ONE:
3238 clean_merge = handle_rename_normal(opt,
3245 case RENAME_VIA_DIR:
3247 if (handle_rename_via_dir(opt, ci->ren1->pair, ci->branch1))
3252 * Probably unclean merge, but if the renamed file
3253 * merges cleanly and the result can then be
3254 * two-way merged cleanly with the added file, I
3255 * guess it's a clean merge?
3257 clean_merge = handle_rename_add(opt, ci);
3261 if (handle_rename_delete(opt, ci->ren1->pair,
3262 ci->branch1, ci->branch2))
3265 case RENAME_ONE_FILE_TO_TWO:
3267 if (handle_rename_rename_1to2(opt, ci))
3270 case RENAME_TWO_FILES_TO_ONE:
3272 * Probably unclean merge, but if the two renamed
3273 * files merge cleanly and the two resulting files
3274 * can then be two-way merged cleanly, I guess it's
3277 clean_merge = handle_rename_rename_2to1(opt, ci);
3280 entry->processed = 0;
3283 } else if (o_oid && (!a_oid || !b_oid)) {
3284 /* Case A: Deleted in one */
3285 if ((!a_oid && !b_oid) ||
3286 (!b_oid && blob_unchanged(opt, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
3287 (!a_oid && blob_unchanged(opt, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
3288 /* Deleted in both or deleted in one and
3289 * unchanged in the other */
3291 output(opt, 2, _("Removing %s"), path);
3292 /* do not touch working file if it did not exist */
3293 remove_file(opt, 1, path, !a_oid);
3295 /* Modify/delete; deleted side may have put a directory in the way */
3297 if (handle_modify_delete(opt, path, o_oid, o_mode,
3298 a_oid, a_mode, b_oid, b_mode))
3301 } else if ((!o_oid && a_oid && !b_oid) ||
3302 (!o_oid && !a_oid && b_oid)) {
3303 /* Case B: Added in one. */
3304 /* [nothing|directory] -> ([nothing|directory], file) */
3306 const char *add_branch;
3307 const char *other_branch;
3309 const struct object_id *oid;
3313 add_branch = opt->branch1;
3314 other_branch = opt->branch2;
3317 conf = _("file/directory");
3319 add_branch = opt->branch2;
3320 other_branch = opt->branch1;
3323 conf = _("directory/file");
3325 if (dir_in_way(opt->repo->index, path,
3326 !opt->call_depth && !S_ISGITLINK(a_mode),
3328 char *new_path = unique_path(opt, path, add_branch);
3330 output(opt, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3332 conf, path, other_branch, path, new_path);
3333 if (update_file(opt, 0, oid, mode, new_path))
3335 else if (opt->call_depth)
3336 remove_file_from_index(opt->repo->index, path);
3339 output(opt, 2, _("Adding %s"), path);
3340 /* do not overwrite file if already present */
3341 if (update_file_flags(opt, oid, mode, path, 1, !a_oid))
3344 } else if (a_oid && b_oid) {
3346 /* Case C: Added in both (check for same permissions) */
3348 _("CONFLICT (add/add): Merge conflict in %s"),
3350 clean_merge = handle_file_collision(opt,
3357 /* case D: Modified in both, but differently. */
3358 int is_dirty = 0; /* unpack_trees would have bailed if dirty */
3359 clean_merge = handle_content_merge(opt, path,
3366 } else if (!o_oid && !a_oid && !b_oid) {
3368 * this entry was deleted altogether. a_mode == 0 means
3369 * we had that path and want to actively remove it.
3371 remove_file(opt, 1, path, !a_mode);
3373 BUG("fatal merge failure, shouldn't happen.");
3378 int merge_trees(struct merge_options *opt,
3381 struct tree *common,
3382 struct tree **result)
3384 struct index_state *istate = opt->repo->index;
3386 struct strbuf sb = STRBUF_INIT;
3388 if (!opt->call_depth && repo_index_has_changes(opt->repo, head, &sb)) {
3389 err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3394 if (opt->subtree_shift) {
3395 merge = shift_tree_object(opt->repo, head, merge, opt->subtree_shift);
3396 common = shift_tree_object(opt->repo, head, common, opt->subtree_shift);
3399 if (oid_eq(&common->object.oid, &merge->object.oid)) {
3400 output(opt, 0, _("Already up to date!"));
3405 code = unpack_trees_start(opt, common, head, merge);
3408 if (show(opt, 4) || opt->call_depth)
3409 err(opt, _("merging of trees %s and %s failed"),
3410 oid_to_hex(&head->object.oid),
3411 oid_to_hex(&merge->object.oid));
3412 unpack_trees_finish(opt);
3416 if (unmerged_index(istate)) {
3417 struct string_list *entries;
3418 struct rename_info re_info;
3421 * Only need the hashmap while processing entries, so
3422 * initialize it here and free it when we are done running
3423 * through the entries. Keeping it in the merge_options as
3424 * opposed to decaring a local hashmap is for convenience
3425 * so that we don't have to pass it to around.
3427 hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp, NULL, 512);
3428 get_files_dirs(opt, head);
3429 get_files_dirs(opt, merge);
3431 entries = get_unmerged(opt->repo->index);
3432 clean = detect_and_process_renames(opt, common, head, merge,
3434 record_df_conflict_files(opt, entries);
3437 for (i = entries->nr-1; 0 <= i; i--) {
3438 const char *path = entries->items[i].string;
3439 struct stage_data *e = entries->items[i].util;
3440 if (!e->processed) {
3441 int ret = process_entry(opt, path, e);
3450 for (i = 0; i < entries->nr; i++) {
3451 struct stage_data *e = entries->items[i].util;
3453 BUG("unprocessed path??? %s",
3454 entries->items[i].string);
3458 final_cleanup_renames(&re_info);
3460 string_list_clear(entries, 1);
3463 hashmap_free(&opt->current_file_dir_set, 1);
3466 unpack_trees_finish(opt);
3473 unpack_trees_finish(opt);
3475 if (opt->call_depth && !(*result = write_tree_from_memory(opt)))
3481 static struct commit_list *reverse_commit_list(struct commit_list *list)
3483 struct commit_list *next = NULL, *current, *backup;
3484 for (current = list; current; current = backup) {
3485 backup = current->next;
3486 current->next = next;
3493 * Merge the commits h1 and h2, return the resulting virtual
3494 * commit object and a flag indicating the cleanness of the merge.
3496 int merge_recursive(struct merge_options *opt,
3499 struct commit_list *ca,
3500 struct commit **result)
3502 struct commit_list *iter;
3503 struct commit *merged_common_ancestors;
3504 struct tree *mrtree;
3508 output(opt, 4, _("Merging:"));
3509 output_commit_title(opt, h1);
3510 output_commit_title(opt, h2);
3514 ca = get_merge_bases(h1, h2);
3515 ca = reverse_commit_list(ca);
3519 unsigned cnt = commit_list_count(ca);
3521 output(opt, 5, Q_("found %u common ancestor:",
3522 "found %u common ancestors:", cnt), cnt);
3523 for (iter = ca; iter; iter = iter->next)
3524 output_commit_title(opt, iter->item);
3527 merged_common_ancestors = pop_commit(&ca);
3528 if (merged_common_ancestors == NULL) {
3529 /* if there is no common ancestor, use an empty tree */
3532 tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree);
3533 merged_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor");
3536 for (iter = ca; iter; iter = iter->next) {
3537 const char *saved_b1, *saved_b2;
3540 * When the merge fails, the result contains files
3541 * with conflict markers. The cleanness flag is
3542 * ignored (unless indicating an error), it was never
3543 * actually used, as result of merge_trees has always
3544 * overwritten it: the committed "conflicts" were
3547 discard_index(opt->repo->index);
3548 saved_b1 = opt->branch1;
3549 saved_b2 = opt->branch2;
3550 opt->branch1 = "Temporary merge branch 1";
3551 opt->branch2 = "Temporary merge branch 2";
3552 if (merge_recursive(opt, merged_common_ancestors, iter->item,
3553 NULL, &merged_common_ancestors) < 0)
3555 opt->branch1 = saved_b1;
3556 opt->branch2 = saved_b2;
3559 if (!merged_common_ancestors)
3560 return err(opt, _("merge returned no commit"));
3563 discard_index(opt->repo->index);
3564 if (!opt->call_depth)
3565 repo_read_index(opt->repo);
3567 opt->ancestor = "merged common ancestors";
3568 clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2),
3569 get_commit_tree(merged_common_ancestors),
3576 if (opt->call_depth) {
3577 *result = make_virtual_commit(opt->repo, mrtree, "merged tree");
3578 commit_list_insert(h1, &(*result)->parents);
3579 commit_list_insert(h2, &(*result)->parents->next);
3582 if (!opt->call_depth && opt->buffer_output < 2)
3583 strbuf_release(&opt->obuf);
3585 diff_warn_rename_limit("merge.renamelimit",
3586 opt->needed_rename_limit, 0);
3590 static struct commit *get_ref(struct repository *repo, const struct object_id *oid,
3593 struct object *object;
3595 object = deref_tag(repo, parse_object(repo, oid),
3596 name, strlen(name));
3599 if (object->type == OBJ_TREE)
3600 return make_virtual_commit(repo, (struct tree*)object, name);
3601 if (object->type != OBJ_COMMIT)
3603 if (parse_commit((struct commit *)object))
3605 return (struct commit *)object;
3608 int merge_recursive_generic(struct merge_options *opt,
3609 const struct object_id *head,
3610 const struct object_id *merge,
3612 const struct object_id **base_list,
3613 struct commit **result)
3616 struct lock_file lock = LOCK_INIT;
3617 struct commit *head_commit = get_ref(opt->repo, head, opt->branch1);
3618 struct commit *next_commit = get_ref(opt->repo, merge, opt->branch2);
3619 struct commit_list *ca = NULL;
3623 for (i = 0; i < num_base_list; ++i) {
3624 struct commit *base;
3625 if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i]))))
3626 return err(opt, _("Could not parse object '%s'"),
3627 oid_to_hex(base_list[i]));
3628 commit_list_insert(base, &ca);
3632 repo_hold_locked_index(opt->repo, &lock, LOCK_DIE_ON_ERROR);
3633 clean = merge_recursive(opt, head_commit, next_commit, ca,
3636 rollback_lock_file(&lock);
3640 if (write_locked_index(opt->repo->index, &lock,
3641 COMMIT_LOCK | SKIP_IF_UNCHANGED))
3642 return err(opt, _("Unable to write index."));
3644 return clean ? 0 : 1;
3647 static void merge_recursive_config(struct merge_options *opt)
3650 git_config_get_int("merge.verbosity", &opt->verbosity);
3651 git_config_get_int("diff.renamelimit", &opt->diff_rename_limit);
3652 git_config_get_int("merge.renamelimit", &opt->merge_rename_limit);
3653 if (!git_config_get_string("diff.renames", &value)) {
3654 opt->diff_detect_rename = git_config_rename("diff.renames", value);
3657 if (!git_config_get_string("merge.renames", &value)) {
3658 opt->merge_detect_rename = git_config_rename("merge.renames", value);
3661 git_config(git_xmerge_config, NULL);
3664 void init_merge_options(struct merge_options *opt,
3665 struct repository *repo)
3667 const char *merge_verbosity;
3668 memset(opt, 0, sizeof(struct merge_options));
3671 opt->buffer_output = 1;
3672 opt->diff_rename_limit = -1;
3673 opt->merge_rename_limit = -1;
3674 opt->renormalize = 0;
3675 opt->diff_detect_rename = -1;
3676 opt->merge_detect_rename = -1;
3677 opt->detect_directory_renames = 1;
3678 merge_recursive_config(opt);
3679 merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
3680 if (merge_verbosity)
3681 opt->verbosity = strtol(merge_verbosity, NULL, 10);
3682 if (opt->verbosity >= 5)
3683 opt->buffer_output = 0;
3684 strbuf_init(&opt->obuf, 0);
3685 string_list_init(&opt->df_conflict_file_set, 1);
3688 int parse_merge_opt(struct merge_options *opt, const char *s)
3694 if (!strcmp(s, "ours"))
3695 opt->recursive_variant = MERGE_RECURSIVE_OURS;
3696 else if (!strcmp(s, "theirs"))
3697 opt->recursive_variant = MERGE_RECURSIVE_THEIRS;
3698 else if (!strcmp(s, "subtree"))
3699 opt->subtree_shift = "";
3700 else if (skip_prefix(s, "subtree=", &arg))
3701 opt->subtree_shift = arg;
3702 else if (!strcmp(s, "patience"))
3703 opt->xdl_opts = DIFF_WITH_ALG(opt, PATIENCE_DIFF);
3704 else if (!strcmp(s, "histogram"))
3705 opt->xdl_opts = DIFF_WITH_ALG(opt, HISTOGRAM_DIFF);
3706 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
3707 long value = parse_algorithm_value(arg);
3710 /* clear out previous settings */
3711 DIFF_XDL_CLR(opt, NEED_MINIMAL);
3712 opt->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3713 opt->xdl_opts |= value;
3715 else if (!strcmp(s, "ignore-space-change"))
3716 DIFF_XDL_SET(opt, IGNORE_WHITESPACE_CHANGE);
3717 else if (!strcmp(s, "ignore-all-space"))
3718 DIFF_XDL_SET(opt, IGNORE_WHITESPACE);
3719 else if (!strcmp(s, "ignore-space-at-eol"))
3720 DIFF_XDL_SET(opt, IGNORE_WHITESPACE_AT_EOL);
3721 else if (!strcmp(s, "ignore-cr-at-eol"))
3722 DIFF_XDL_SET(opt, IGNORE_CR_AT_EOL);
3723 else if (!strcmp(s, "renormalize"))
3724 opt->renormalize = 1;
3725 else if (!strcmp(s, "no-renormalize"))
3726 opt->renormalize = 0;
3727 else if (!strcmp(s, "no-renames"))
3728 opt->merge_detect_rename = 0;
3729 else if (!strcmp(s, "find-renames")) {
3730 opt->merge_detect_rename = 1;
3731 opt->rename_score = 0;
3733 else if (skip_prefix(s, "find-renames=", &arg) ||
3734 skip_prefix(s, "rename-threshold=", &arg)) {
3735 if ((opt->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
3737 opt->merge_detect_rename = 1;
3740 * Please update $__git_merge_strategy_options in
3741 * git-completion.bash when you add new options