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 inline void set_commit_tree(struct commit *c, struct tree *t)
171 static struct commit *make_virtual_commit(struct repository *repo,
175 struct commit *commit = alloc_commit_node(repo);
177 set_merge_remote_desc(commit, comment, (struct object *)commit);
178 set_commit_tree(commit, tree);
179 commit->object.parsed = 1;
184 * Since we use get_tree_entry(), which does not put the read object into
185 * the object pool, we cannot rely on a == b.
187 static int oid_eq(const struct object_id *a, const struct object_id *b)
191 return a && b && oideq(a, b);
199 RENAME_ONE_FILE_TO_ONE,
200 RENAME_ONE_FILE_TO_TWO,
201 RENAME_TWO_FILES_TO_ONE
205 * Since we want to write the index eventually, we cannot reuse the index
206 * for these (temporary) data.
209 struct diff_filespec stages[4]; /* mostly for oid & mode; maybe path */
210 struct rename_conflict_info *rename_conflict_info;
211 unsigned processed:1;
215 unsigned processed:1;
216 struct diff_filepair *pair;
217 const char *branch; /* branch that the rename occurred on */
219 * If directory rename detection affected this rename, what was its
220 * original type ('A' or 'R') and it's original destination before
221 * the directory rename (otherwise, '\0' and NULL for these two vars).
223 char dir_rename_original_type;
224 char *dir_rename_original_dest;
226 * Purpose of src_entry and dst_entry:
228 * If 'before' is renamed to 'after' then src_entry will contain
229 * the versions of 'before' from the merge_base, HEAD, and MERGE in
230 * stages 1, 2, and 3; dst_entry will contain the respective
231 * versions of 'after' in corresponding locations. Thus, we have a
232 * total of six modes and oids, though some will be null. (Stage 0
233 * is ignored; we're interested in handling conflicts.)
235 * Since we don't turn on break-rewrites by default, neither
236 * src_entry nor dst_entry can have all three of their stages have
237 * non-null oids, meaning at most four of the six will be non-null.
238 * Also, since this is a rename, both src_entry and dst_entry will
239 * have at least one non-null oid, meaning at least two will be
240 * non-null. Of the six oids, a typical rename will have three be
241 * non-null. Only two implies a rename/delete, and four implies a
244 struct stage_data *src_entry;
245 struct stage_data *dst_entry;
248 struct rename_conflict_info {
249 enum rename_type rename_type;
254 static inline void setup_rename_conflict_info(enum rename_type rename_type,
255 struct merge_options *opt,
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 && ren1->branch != opt->branch1) {
269 setup_rename_conflict_info(rename_type, opt, ren2, ren1);
273 ci = xcalloc(1, sizeof(struct rename_conflict_info));
274 ci->rename_type = rename_type;
278 ci->ren1->dst_entry->processed = 0;
279 ci->ren1->dst_entry->rename_conflict_info = ci;
281 ci->ren2->dst_entry->rename_conflict_info = ci;
285 static int show(struct merge_options *opt, int v)
287 return (!opt->call_depth && opt->verbosity >= v) || opt->verbosity >= 5;
290 __attribute__((format (printf, 3, 4)))
291 static void output(struct merge_options *opt, int v, const char *fmt, ...)
298 strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
301 strbuf_vaddf(&opt->obuf, fmt, ap);
304 strbuf_addch(&opt->obuf, '\n');
305 if (!opt->buffer_output)
309 static void output_commit_title(struct merge_options *opt, struct commit *commit)
311 struct merge_remote_desc *desc;
313 strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
314 desc = merge_remote_util(commit);
316 strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
318 strbuf_add_unique_abbrev(&opt->obuf, &commit->object.oid,
320 strbuf_addch(&opt->obuf, ' ');
321 if (parse_commit(commit) != 0)
322 strbuf_addstr(&opt->obuf, _("(bad commit)\n"));
325 const char *msg = get_commit_buffer(commit, NULL);
326 int len = find_commit_subject(msg, &title);
328 strbuf_addf(&opt->obuf, "%.*s\n", len, title);
329 unuse_commit_buffer(commit, msg);
335 static int add_cacheinfo(struct merge_options *opt,
336 const struct diff_filespec *blob,
337 const char *path, int stage, int refresh, int options)
339 struct index_state *istate = opt->repo->index;
340 struct cache_entry *ce;
343 ce = make_cache_entry(istate, blob->mode, &blob->oid, path, stage, 0);
345 return err(opt, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
347 ret = add_index_entry(istate, ce, options);
349 struct cache_entry *nce;
351 nce = refresh_cache_entry(istate, ce,
352 CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
354 return err(opt, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
356 ret = add_index_entry(istate, nce, options);
361 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
364 init_tree_desc(desc, tree->buffer, tree->size);
367 static int unpack_trees_start(struct merge_options *opt,
373 struct tree_desc t[3];
374 struct index_state tmp_index = { NULL };
376 memset(&opt->unpack_opts, 0, sizeof(opt->unpack_opts));
378 opt->unpack_opts.index_only = 1;
380 opt->unpack_opts.update = 1;
381 opt->unpack_opts.merge = 1;
382 opt->unpack_opts.head_idx = 2;
383 opt->unpack_opts.fn = threeway_merge;
384 opt->unpack_opts.src_index = opt->repo->index;
385 opt->unpack_opts.dst_index = &tmp_index;
386 opt->unpack_opts.aggressive = !merge_detect_rename(opt);
387 setup_unpack_trees_porcelain(&opt->unpack_opts, "merge");
389 init_tree_desc_from_tree(t+0, common);
390 init_tree_desc_from_tree(t+1, head);
391 init_tree_desc_from_tree(t+2, merge);
393 rc = unpack_trees(3, t, &opt->unpack_opts);
394 cache_tree_free(&opt->repo->index->cache_tree);
397 * Update opt->repo->index to match the new results, AFTER saving a copy
398 * in opt->orig_index. Update src_index to point to the saved copy.
399 * (verify_uptodate() checks src_index, and the original index is
400 * the one that had the necessary modification timestamps.)
402 opt->orig_index = *opt->repo->index;
403 *opt->repo->index = tmp_index;
404 opt->unpack_opts.src_index = &opt->orig_index;
409 static void unpack_trees_finish(struct merge_options *opt)
411 discard_index(&opt->orig_index);
412 clear_unpack_trees_porcelain(&opt->unpack_opts);
415 struct tree *write_tree_from_memory(struct merge_options *opt)
417 struct tree *result = NULL;
418 struct index_state *istate = opt->repo->index;
420 if (unmerged_index(istate)) {
422 fprintf(stderr, "BUG: There are unmerged index entries:\n");
423 for (i = 0; i < istate->cache_nr; i++) {
424 const struct cache_entry *ce = istate->cache[i];
426 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
427 (int)ce_namelen(ce), ce->name);
429 BUG("unmerged index entries in merge-recursive.c");
432 if (!istate->cache_tree)
433 istate->cache_tree = cache_tree();
435 if (!cache_tree_fully_valid(istate->cache_tree) &&
436 cache_tree_update(istate, 0) < 0) {
437 err(opt, _("error building trees"));
441 result = lookup_tree(opt->repo, &istate->cache_tree->oid);
446 static int save_files_dirs(const struct object_id *oid,
447 struct strbuf *base, const char *path,
448 unsigned int mode, int stage, void *context)
450 struct path_hashmap_entry *entry;
451 int baselen = base->len;
452 struct merge_options *opt = context;
454 strbuf_addstr(base, path);
456 FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
457 hashmap_entry_init(entry, path_hash(entry->path));
458 hashmap_add(&opt->current_file_dir_set, entry);
460 strbuf_setlen(base, baselen);
461 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
464 static void get_files_dirs(struct merge_options *opt, struct tree *tree)
466 struct pathspec match_all;
467 memset(&match_all, 0, sizeof(match_all));
468 read_tree_recursive(the_repository, tree, "", 0, 0,
469 &match_all, save_files_dirs, opt);
472 static int get_tree_entry_if_blob(const struct object_id *tree,
474 struct diff_filespec *dfs)
478 ret = get_tree_entry(tree, path, &dfs->oid, &dfs->mode);
479 if (S_ISDIR(dfs->mode)) {
480 oidcpy(&dfs->oid, &null_oid);
487 * Returns an index_entry instance which doesn't have to correspond to
488 * a real cache entry in Git's index.
490 static struct stage_data *insert_stage_data(const char *path,
491 struct tree *o, struct tree *a, struct tree *b,
492 struct string_list *entries)
494 struct string_list_item *item;
495 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
496 get_tree_entry_if_blob(&o->object.oid, path, &e->stages[1]);
497 get_tree_entry_if_blob(&a->object.oid, path, &e->stages[2]);
498 get_tree_entry_if_blob(&b->object.oid, path, &e->stages[3]);
499 item = string_list_insert(entries, path);
505 * Create a dictionary mapping file names to stage_data objects. The
506 * dictionary contains one entry for every path with a non-zero stage entry.
508 static struct string_list *get_unmerged(struct index_state *istate)
510 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
513 unmerged->strdup_strings = 1;
515 for (i = 0; i < istate->cache_nr; i++) {
516 struct string_list_item *item;
517 struct stage_data *e;
518 const struct cache_entry *ce = istate->cache[i];
522 item = string_list_lookup(unmerged, ce->name);
524 item = string_list_insert(unmerged, ce->name);
525 item->util = xcalloc(1, sizeof(struct stage_data));
528 e->stages[ce_stage(ce)].mode = ce->ce_mode;
529 oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
535 static int string_list_df_name_compare(const char *one, const char *two)
537 int onelen = strlen(one);
538 int twolen = strlen(two);
540 * Here we only care that entries for D/F conflicts are
541 * adjacent, in particular with the file of the D/F conflict
542 * appearing before files below the corresponding directory.
543 * The order of the rest of the list is irrelevant for us.
545 * To achieve this, we sort with df_name_compare and provide
546 * the mode S_IFDIR so that D/F conflicts will sort correctly.
547 * We use the mode S_IFDIR for everything else for simplicity,
548 * since in other cases any changes in their order due to
549 * sorting cause no problems for us.
551 int cmp = df_name_compare(one, onelen, S_IFDIR,
552 two, twolen, S_IFDIR);
554 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
555 * that 'foo' comes before 'foo/bar'.
559 return onelen - twolen;
562 static void record_df_conflict_files(struct merge_options *opt,
563 struct string_list *entries)
565 /* If there is a D/F conflict and the file for such a conflict
566 * currently exists in the working tree, we want to allow it to be
567 * removed to make room for the corresponding directory if needed.
568 * The files underneath the directories of such D/F conflicts will
569 * be processed before the corresponding file involved in the D/F
570 * conflict. If the D/F directory ends up being removed by the
571 * merge, then we won't have to touch the D/F file. If the D/F
572 * directory needs to be written to the working copy, then the D/F
573 * file will simply be removed (in make_room_for_path()) to make
574 * room for the necessary paths. Note that if both the directory
575 * and the file need to be present, then the D/F file will be
576 * reinstated with a new unique name at the time it is processed.
578 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
579 const char *last_file = NULL;
584 * If we're merging merge-bases, we don't want to bother with
585 * any working directory changes.
590 /* Ensure D/F conflicts are adjacent in the entries list. */
591 for (i = 0; i < entries->nr; i++) {
592 struct string_list_item *next = &entries->items[i];
593 string_list_append(&df_sorted_entries, next->string)->util =
596 df_sorted_entries.cmp = string_list_df_name_compare;
597 string_list_sort(&df_sorted_entries);
599 string_list_clear(&opt->df_conflict_file_set, 1);
600 for (i = 0; i < df_sorted_entries.nr; i++) {
601 const char *path = df_sorted_entries.items[i].string;
602 int len = strlen(path);
603 struct stage_data *e = df_sorted_entries.items[i].util;
606 * Check if last_file & path correspond to a D/F conflict;
607 * i.e. whether path is last_file+'/'+<something>.
608 * If so, record that it's okay to remove last_file to make
609 * room for path and friends if needed.
613 memcmp(path, last_file, last_len) == 0 &&
614 path[last_len] == '/') {
615 string_list_insert(&opt->df_conflict_file_set, last_file);
619 * Determine whether path could exist as a file in the
620 * working directory as a possible D/F conflict. This
621 * will only occur when it exists in stage 2 as a
624 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
631 string_list_clear(&df_sorted_entries, 0);
634 static int update_stages(struct merge_options *opt, const char *path,
635 const struct diff_filespec *o,
636 const struct diff_filespec *a,
637 const struct diff_filespec *b)
641 * NOTE: It is usually a bad idea to call update_stages on a path
642 * before calling update_file on that same path, since it can
643 * sometimes lead to spurious "refusing to lose untracked file..."
644 * messages from update_file (via make_room_for path via
645 * would_lose_untracked). Instead, reverse the order of the calls
646 * (executing update_file first and then update_stages).
649 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
651 if (remove_file_from_index(opt->repo->index, path))
654 if (add_cacheinfo(opt, o, path, 1, 0, options))
657 if (add_cacheinfo(opt, a, path, 2, 0, options))
660 if (add_cacheinfo(opt, b, path, 3, 0, options))
665 static void update_entry(struct stage_data *entry,
666 struct diff_filespec *o,
667 struct diff_filespec *a,
668 struct diff_filespec *b)
670 entry->processed = 0;
671 entry->stages[1].mode = o->mode;
672 entry->stages[2].mode = a->mode;
673 entry->stages[3].mode = b->mode;
674 oidcpy(&entry->stages[1].oid, &o->oid);
675 oidcpy(&entry->stages[2].oid, &a->oid);
676 oidcpy(&entry->stages[3].oid, &b->oid);
679 static int remove_file(struct merge_options *opt, int clean,
680 const char *path, int no_wd)
682 int update_cache = opt->call_depth || clean;
683 int update_working_directory = !opt->call_depth && !no_wd;
686 if (remove_file_from_index(opt->repo->index, path))
689 if (update_working_directory) {
691 struct cache_entry *ce;
692 ce = index_file_exists(opt->repo->index, path, strlen(path),
694 if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
697 if (remove_path(path))
703 /* add a string to a strbuf, but converting "/" to "_" */
704 static void add_flattened_path(struct strbuf *out, const char *s)
707 strbuf_addstr(out, s);
708 for (; i < out->len; i++)
709 if (out->buf[i] == '/')
713 static char *unique_path(struct merge_options *opt, const char *path, const char *branch)
715 struct path_hashmap_entry *entry;
716 struct strbuf newpath = STRBUF_INIT;
720 strbuf_addf(&newpath, "%s~", path);
721 add_flattened_path(&newpath, branch);
723 base_len = newpath.len;
724 while (hashmap_get_from_hash(&opt->current_file_dir_set,
725 path_hash(newpath.buf), newpath.buf) ||
726 (!opt->call_depth && file_exists(newpath.buf))) {
727 strbuf_setlen(&newpath, base_len);
728 strbuf_addf(&newpath, "_%d", suffix++);
731 FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
732 hashmap_entry_init(entry, path_hash(entry->path));
733 hashmap_add(&opt->current_file_dir_set, entry);
734 return strbuf_detach(&newpath, NULL);
738 * Check whether a directory in the index is in the way of an incoming
739 * file. Return 1 if so. If check_working_copy is non-zero, also
740 * check the working directory. If empty_ok is non-zero, also return
741 * 0 in the case where the working-tree dir exists but is empty.
743 static int dir_in_way(struct index_state *istate, const char *path,
744 int check_working_copy, int empty_ok)
747 struct strbuf dirpath = STRBUF_INIT;
750 strbuf_addstr(&dirpath, path);
751 strbuf_addch(&dirpath, '/');
753 pos = index_name_pos(istate, dirpath.buf, dirpath.len);
757 if (pos < istate->cache_nr &&
758 !strncmp(dirpath.buf, istate->cache[pos]->name, dirpath.len)) {
759 strbuf_release(&dirpath);
763 strbuf_release(&dirpath);
764 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
765 !(empty_ok && is_empty_dir(path));
769 * Returns whether path was tracked in the index before the merge started,
770 * and its oid and mode match the specified values
772 static int was_tracked_and_matches(struct merge_options *opt, const char *path,
773 const struct diff_filespec *blob)
775 int pos = index_name_pos(&opt->orig_index, path, strlen(path));
776 struct cache_entry *ce;
779 /* we were not tracking this path before the merge */
782 /* See if the file we were tracking before matches */
783 ce = opt->orig_index.cache[pos];
784 return (oid_eq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode);
788 * Returns whether path was tracked in the index before the merge started
790 static int was_tracked(struct merge_options *opt, const char *path)
792 int pos = index_name_pos(&opt->orig_index, path, strlen(path));
795 /* we were tracking this path before the merge */
801 static int would_lose_untracked(struct merge_options *opt, const char *path)
803 struct index_state *istate = opt->repo->index;
806 * This may look like it can be simplified to:
807 * return !was_tracked(opt, path) && file_exists(path)
808 * but it can't. This function needs to know whether path was in
809 * the working tree due to EITHER having been tracked in the index
810 * before the merge OR having been put into the working copy and
811 * index by unpack_trees(). Due to that either-or requirement, we
812 * check the current index instead of the original one.
814 * Note that we do not need to worry about merge-recursive itself
815 * updating the index after unpack_trees() and before calling this
816 * function, because we strictly require all code paths in
817 * merge-recursive to update the working tree first and the index
818 * second. Doing otherwise would break
819 * update_file()/would_lose_untracked(); see every comment in this
820 * file which mentions "update_stages".
822 int pos = index_name_pos(istate, path, strlen(path));
826 while (pos < istate->cache_nr &&
827 !strcmp(path, istate->cache[pos]->name)) {
829 * If stage #0, it is definitely tracked.
830 * If it has stage #2 then it was tracked
831 * before this merge started. All other
832 * cases the path was not tracked.
834 switch (ce_stage(istate->cache[pos])) {
841 return file_exists(path);
844 static int was_dirty(struct merge_options *opt, const char *path)
846 struct cache_entry *ce;
849 if (opt->call_depth || !was_tracked(opt, path))
852 ce = index_file_exists(opt->unpack_opts.src_index,
853 path, strlen(path), ignore_case);
854 dirty = verify_uptodate(ce, &opt->unpack_opts) != 0;
858 static int make_room_for_path(struct merge_options *opt, const char *path)
861 const char *msg = _("failed to create path '%s'%s");
863 /* Unlink any D/F conflict files that are in the way */
864 for (i = 0; i < opt->df_conflict_file_set.nr; i++) {
865 const char *df_path = opt->df_conflict_file_set.items[i].string;
866 size_t pathlen = strlen(path);
867 size_t df_pathlen = strlen(df_path);
868 if (df_pathlen < pathlen &&
869 path[df_pathlen] == '/' &&
870 strncmp(path, df_path, df_pathlen) == 0) {
872 _("Removing %s to make room for subdirectory\n"),
875 unsorted_string_list_delete_item(&opt->df_conflict_file_set,
881 /* Make sure leading directories are created */
882 status = safe_create_leading_directories_const(path);
884 if (status == SCLD_EXISTS)
885 /* something else exists */
886 return err(opt, msg, path, _(": perhaps a D/F conflict?"));
887 return err(opt, msg, path, "");
891 * Do not unlink a file in the work tree if we are not
894 if (would_lose_untracked(opt, path))
895 return err(opt, _("refusing to lose untracked file at '%s'"),
898 /* Successful unlink is good.. */
901 /* .. and so is no existing file */
904 /* .. but not some other error (who really cares what?) */
905 return err(opt, msg, path, _(": perhaps a D/F conflict?"));
908 static int update_file_flags(struct merge_options *opt,
909 const struct diff_filespec *contents,
920 enum object_type type;
924 if (S_ISGITLINK(contents->mode)) {
926 * We may later decide to recursively descend into
927 * the submodule directory and update its index
928 * and/or work tree, but we do not do that now.
934 buf = read_object_file(&contents->oid, &type, &size);
936 return err(opt, _("cannot read object %s '%s'"),
937 oid_to_hex(&contents->oid), path);
938 if (type != OBJ_BLOB) {
939 ret = err(opt, _("blob expected for %s '%s'"),
940 oid_to_hex(&contents->oid), path);
943 if (S_ISREG(contents->mode)) {
944 struct strbuf strbuf = STRBUF_INIT;
945 if (convert_to_working_tree(opt->repo->index, path, buf, size, &strbuf)) {
948 buf = strbuf_detach(&strbuf, NULL);
952 if (make_room_for_path(opt, path) < 0) {
956 if (S_ISREG(contents->mode) ||
957 (!has_symlinks && S_ISLNK(contents->mode))) {
959 int mode = (contents->mode & 0100 ? 0777 : 0666);
961 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
963 ret = err(opt, _("failed to open '%s': %s"),
964 path, strerror(errno));
967 write_in_full(fd, buf, size);
969 } else if (S_ISLNK(contents->mode)) {
970 char *lnk = xmemdupz(buf, size);
971 safe_create_leading_directories_const(path);
973 if (symlink(lnk, path))
974 ret = err(opt, _("failed to symlink '%s': %s"),
975 path, strerror(errno));
979 _("do not know what to do with %06o %s '%s'"),
980 contents->mode, oid_to_hex(&contents->oid), path);
985 if (!ret && update_cache)
986 if (add_cacheinfo(opt, contents, path, 0, update_wd,
987 ADD_CACHE_OK_TO_ADD))
992 static int update_file(struct merge_options *opt,
994 const struct diff_filespec *contents,
997 return update_file_flags(opt, contents, path,
998 opt->call_depth || clean, !opt->call_depth);
1001 /* Low level file merging, update and removal */
1003 struct merge_file_info {
1004 struct diff_filespec blob; /* mostly use oid & mode; sometimes path */
1009 static int merge_3way(struct merge_options *opt,
1010 mmbuffer_t *result_buf,
1011 const struct diff_filespec *o,
1012 const struct diff_filespec *a,
1013 const struct diff_filespec *b,
1014 const char *branch1,
1015 const char *branch2,
1016 const int extra_marker_size)
1018 mmfile_t orig, src1, src2;
1019 struct ll_merge_options ll_opts = {0};
1020 char *base_name, *name1, *name2;
1023 ll_opts.renormalize = opt->renormalize;
1024 ll_opts.extra_marker_size = extra_marker_size;
1025 ll_opts.xdl_opts = opt->xdl_opts;
1027 if (opt->call_depth) {
1028 ll_opts.virtual_ancestor = 1;
1029 ll_opts.variant = 0;
1031 switch (opt->recursive_variant) {
1032 case MERGE_RECURSIVE_OURS:
1033 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
1035 case MERGE_RECURSIVE_THEIRS:
1036 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
1039 ll_opts.variant = 0;
1044 assert(a->path && b->path);
1045 if (strcmp(a->path, b->path) ||
1046 (opt->ancestor != NULL && strcmp(a->path, o->path) != 0)) {
1047 base_name = opt->ancestor == NULL ? NULL :
1048 mkpathdup("%s:%s", opt->ancestor, o->path);
1049 name1 = mkpathdup("%s:%s", branch1, a->path);
1050 name2 = mkpathdup("%s:%s", branch2, b->path);
1052 base_name = opt->ancestor == NULL ? NULL :
1053 mkpathdup("%s", opt->ancestor);
1054 name1 = mkpathdup("%s", branch1);
1055 name2 = mkpathdup("%s", branch2);
1058 read_mmblob(&orig, &o->oid);
1059 read_mmblob(&src1, &a->oid);
1060 read_mmblob(&src2, &b->oid);
1062 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
1063 &src1, name1, &src2, name2,
1064 opt->repo->index, &ll_opts);
1072 return merge_status;
1075 static int find_first_merges(struct repository *repo,
1076 struct object_array *result, const char *path,
1077 struct commit *a, struct commit *b)
1080 struct object_array merges = OBJECT_ARRAY_INIT;
1081 struct commit *commit;
1082 int contains_another;
1084 char merged_revision[GIT_MAX_HEXSZ + 2];
1085 const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
1086 "--all", merged_revision, NULL };
1087 struct rev_info revs;
1088 struct setup_revision_opt rev_opts;
1090 memset(result, 0, sizeof(struct object_array));
1091 memset(&rev_opts, 0, sizeof(rev_opts));
1093 /* get all revisions that merge commit a */
1094 xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
1095 oid_to_hex(&a->object.oid));
1096 repo_init_revisions(repo, &revs, NULL);
1097 rev_opts.submodule = path;
1098 /* FIXME: can't handle linked worktrees in submodules yet */
1099 revs.single_worktree = path != NULL;
1100 setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
1102 /* save all revisions from the above list that contain b */
1103 if (prepare_revision_walk(&revs))
1104 die("revision walk setup failed");
1105 while ((commit = get_revision(&revs)) != NULL) {
1106 struct object *o = &(commit->object);
1107 if (in_merge_bases(b, commit))
1108 add_object_array(o, NULL, &merges);
1110 reset_revision_walk();
1112 /* Now we've got all merges that contain a and b. Prune all
1113 * merges that contain another found merge and save them in
1116 for (i = 0; i < merges.nr; i++) {
1117 struct commit *m1 = (struct commit *) merges.objects[i].item;
1119 contains_another = 0;
1120 for (j = 0; j < merges.nr; j++) {
1121 struct commit *m2 = (struct commit *) merges.objects[j].item;
1122 if (i != j && in_merge_bases(m2, m1)) {
1123 contains_another = 1;
1128 if (!contains_another)
1129 add_object_array(merges.objects[i].item, NULL, result);
1132 object_array_clear(&merges);
1136 static void print_commit(struct commit *commit)
1138 struct strbuf sb = STRBUF_INIT;
1139 struct pretty_print_context ctx = {0};
1140 ctx.date_mode.type = DATE_NORMAL;
1141 format_commit_message(commit, " %h: %m %s", &sb, &ctx);
1142 fprintf(stderr, "%s\n", sb.buf);
1143 strbuf_release(&sb);
1146 static int is_valid(const struct diff_filespec *dfs)
1148 return dfs->mode != 0 && !is_null_oid(&dfs->oid);
1151 static int merge_submodule(struct merge_options *opt,
1152 struct object_id *result, const char *path,
1153 const struct object_id *base, const struct object_id *a,
1154 const struct object_id *b)
1156 struct commit *commit_base, *commit_a, *commit_b;
1158 struct object_array merges;
1161 int search = !opt->call_depth;
1163 /* store a in result in case we fail */
1166 /* we can not handle deletion conflicts */
1167 if (is_null_oid(base))
1174 if (add_submodule_odb(path)) {
1175 output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
1179 if (!(commit_base = lookup_commit_reference(opt->repo, base)) ||
1180 !(commit_a = lookup_commit_reference(opt->repo, a)) ||
1181 !(commit_b = lookup_commit_reference(opt->repo, b))) {
1182 output(opt, 1, _("Failed to merge submodule %s (commits not present)"), path);
1186 /* check whether both changes are forward */
1187 if (!in_merge_bases(commit_base, commit_a) ||
1188 !in_merge_bases(commit_base, commit_b)) {
1189 output(opt, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
1193 /* Case #1: a is contained in b or vice versa */
1194 if (in_merge_bases(commit_a, commit_b)) {
1197 output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1198 output_commit_title(opt, commit_b);
1199 } else if (show(opt, 2))
1200 output(opt, 2, _("Fast-forwarding submodule %s"), path);
1206 if (in_merge_bases(commit_b, commit_a)) {
1209 output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1210 output_commit_title(opt, commit_a);
1211 } else if (show(opt, 2))
1212 output(opt, 2, _("Fast-forwarding submodule %s"), path);
1220 * Case #2: There are one or more merges that contain a and b in
1221 * the submodule. If there is only one, then present it as a
1222 * suggestion to the user, but leave it marked unmerged so the
1223 * user needs to confirm the resolution.
1226 /* Skip the search if makes no sense to the calling context. */
1230 /* find commit which merges them */
1231 parent_count = find_first_merges(opt->repo, &merges, path,
1232 commit_a, commit_b);
1233 switch (parent_count) {
1235 output(opt, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
1239 output(opt, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
1240 output(opt, 2, _("Found a possible merge resolution for the submodule:\n"));
1241 print_commit((struct commit *) merges.objects[0].item);
1243 "If this is correct simply add it to the index "
1246 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1247 "which will accept this suggestion.\n"),
1248 oid_to_hex(&merges.objects[0].item->oid), path);
1252 output(opt, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
1253 for (i = 0; i < merges.nr; i++)
1254 print_commit((struct commit *) merges.objects[i].item);
1257 object_array_clear(&merges);
1261 static int merge_mode_and_contents(struct merge_options *opt,
1262 const struct diff_filespec *o,
1263 const struct diff_filespec *a,
1264 const struct diff_filespec *b,
1265 const char *filename,
1266 const char *branch1,
1267 const char *branch2,
1268 const int extra_marker_size,
1269 struct merge_file_info *result)
1271 if (opt->branch1 != branch1) {
1273 * It's weird getting a reverse merge with HEAD on the bottom
1274 * side of the conflict markers and the other branch on the
1277 return merge_mode_and_contents(opt, o, b, a,
1280 extra_marker_size, result);
1286 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
1288 if (S_ISREG(a->mode)) {
1289 result->blob.mode = a->mode;
1290 oidcpy(&result->blob.oid, &a->oid);
1292 result->blob.mode = b->mode;
1293 oidcpy(&result->blob.oid, &b->oid);
1296 if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid))
1302 if (a->mode == b->mode || a->mode == o->mode)
1303 result->blob.mode = b->mode;
1305 result->blob.mode = a->mode;
1306 if (b->mode != o->mode) {
1312 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid))
1313 oidcpy(&result->blob.oid, &b->oid);
1314 else if (oid_eq(&b->oid, &o->oid))
1315 oidcpy(&result->blob.oid, &a->oid);
1316 else if (S_ISREG(a->mode)) {
1317 mmbuffer_t result_buf;
1318 int ret = 0, merge_status;
1320 merge_status = merge_3way(opt, &result_buf, o, a, b,
1324 if ((merge_status < 0) || !result_buf.ptr)
1325 ret = err(opt, _("Failed to execute internal merge"));
1328 write_object_file(result_buf.ptr, result_buf.size,
1329 blob_type, &result->blob.oid))
1330 ret = err(opt, _("Unable to add %s to database"),
1333 free(result_buf.ptr);
1336 result->clean = (merge_status == 0);
1337 } else if (S_ISGITLINK(a->mode)) {
1338 result->clean = merge_submodule(opt, &result->blob.oid,
1343 } else if (S_ISLNK(a->mode)) {
1344 switch (opt->recursive_variant) {
1345 case MERGE_RECURSIVE_NORMAL:
1346 oidcpy(&result->blob.oid, &a->oid);
1347 if (!oid_eq(&a->oid, &b->oid))
1350 case MERGE_RECURSIVE_OURS:
1351 oidcpy(&result->blob.oid, &a->oid);
1353 case MERGE_RECURSIVE_THEIRS:
1354 oidcpy(&result->blob.oid, &b->oid);
1358 BUG("unsupported object type in the tree");
1362 output(opt, 2, _("Auto-merging %s"), filename);
1367 static int handle_rename_via_dir(struct merge_options *opt,
1368 struct rename_conflict_info *ci)
1371 * Handle file adds that need to be renamed due to directory rename
1372 * detection. This differs from handle_rename_normal, because
1373 * there is no content merge to do; just move the file into the
1374 * desired final location.
1376 const struct rename *ren = ci->ren1;
1377 const struct diff_filespec *dest = ren->pair->two;
1378 char *file_path = dest->path;
1379 int mark_conflicted = (opt->detect_directory_renames == 1);
1380 assert(ren->dir_rename_original_dest);
1382 if (!opt->call_depth && would_lose_untracked(opt, dest->path)) {
1383 mark_conflicted = 1;
1384 file_path = unique_path(opt, dest->path, ren->branch);
1385 output(opt, 1, _("Error: Refusing to lose untracked file at %s; "
1386 "writing to %s instead."),
1387 dest->path, file_path);
1390 if (mark_conflicted) {
1392 * Write the file in worktree at file_path. In the index,
1393 * only record the file at dest->path in the appropriate
1396 if (update_file(opt, 0, dest, file_path))
1398 if (file_path != dest->path)
1400 if (update_stages(opt, dest->path, NULL,
1401 ren->branch == opt->branch1 ? dest : NULL,
1402 ren->branch == opt->branch1 ? NULL : dest))
1404 return 0; /* not clean, but conflicted */
1406 /* Update dest->path both in index and in worktree */
1407 if (update_file(opt, 1, dest, dest->path))
1409 return 1; /* clean */
1413 static int handle_change_delete(struct merge_options *opt,
1414 const char *path, const char *old_path,
1415 const struct diff_filespec *o,
1416 const struct diff_filespec *changed,
1417 const char *change_branch,
1418 const char *delete_branch,
1419 const char *change, const char *change_past)
1421 char *alt_path = NULL;
1422 const char *update_path = path;
1425 if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0) ||
1426 (!opt->call_depth && would_lose_untracked(opt, path))) {
1427 update_path = alt_path = unique_path(opt, path, change_branch);
1430 if (opt->call_depth) {
1432 * We cannot arbitrarily accept either a_sha or b_sha as
1433 * correct; since there is no true "middle point" between
1434 * them, simply reuse the base version for virtual merge base.
1436 ret = remove_file_from_index(opt->repo->index, path);
1438 ret = update_file(opt, 0, o, update_path);
1441 * Despite the four nearly duplicate messages and argument
1442 * lists below and the ugliness of the nested if-statements,
1443 * having complete messages makes the job easier for
1446 * The slight variance among the cases is due to the fact
1448 * 1) directory/file conflicts (in effect if
1449 * !alt_path) could cause us to need to write the
1450 * file to a different path.
1451 * 2) renames (in effect if !old_path) could mean that
1452 * there are two names for the path that the user
1453 * may know the file by.
1457 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1458 "and %s in %s. Version %s of %s left in tree."),
1459 change, path, delete_branch, change_past,
1460 change_branch, change_branch, path);
1462 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1463 "and %s to %s in %s. Version %s of %s left in tree."),
1464 change, old_path, delete_branch, change_past, path,
1465 change_branch, change_branch, path);
1469 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1470 "and %s in %s. Version %s of %s left in tree at %s."),
1471 change, path, delete_branch, change_past,
1472 change_branch, change_branch, path, alt_path);
1474 output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1475 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1476 change, old_path, delete_branch, change_past, path,
1477 change_branch, change_branch, path, alt_path);
1481 * No need to call update_file() on path when change_branch ==
1482 * opt->branch1 && !alt_path, since that would needlessly touch
1483 * path. We could call update_file_flags() with update_cache=0
1484 * and update_wd=0, but that's a no-op.
1486 if (change_branch != opt->branch1 || alt_path)
1487 ret = update_file(opt, 0, changed, update_path);
1494 static int handle_rename_delete(struct merge_options *opt,
1495 struct rename_conflict_info *ci)
1497 const struct rename *ren = ci->ren1;
1498 const struct diff_filespec *orig = ren->pair->one;
1499 const struct diff_filespec *dest = ren->pair->two;
1500 const char *rename_branch = ren->branch;
1501 const char *delete_branch = (opt->branch1 == ren->branch ?
1502 opt->branch2 : opt->branch1);
1504 if (handle_change_delete(opt,
1505 opt->call_depth ? orig->path : dest->path,
1506 opt->call_depth ? NULL : orig->path,
1508 rename_branch, delete_branch,
1509 _("rename"), _("renamed")))
1512 if (opt->call_depth)
1513 return remove_file_from_index(opt->repo->index, dest->path);
1515 return update_stages(opt, dest->path, NULL,
1516 rename_branch == opt->branch1 ? dest : NULL,
1517 rename_branch == opt->branch1 ? NULL : dest);
1520 static int handle_file_collision(struct merge_options *opt,
1521 const char *collide_path,
1522 const char *prev_path1,
1523 const char *prev_path2,
1524 const char *branch1, const char *branch2,
1525 struct diff_filespec *a,
1526 struct diff_filespec *b)
1528 struct merge_file_info mfi;
1529 struct diff_filespec null;
1530 char *alt_path = NULL;
1531 const char *update_path = collide_path;
1534 * It's easiest to get the correct things into stage 2 and 3, and
1535 * to make sure that the content merge puts HEAD before the other
1536 * branch if we just ensure that branch1 == opt->branch1. So, simply
1537 * flip arguments around if we don't have that.
1539 if (branch1 != opt->branch1) {
1540 return handle_file_collision(opt, collide_path,
1541 prev_path2, prev_path1,
1547 * In the recursive case, we just opt to undo renames
1549 if (opt->call_depth && (prev_path1 || prev_path2)) {
1550 /* Put first file (a->oid, a->mode) in its original spot */
1552 if (update_file(opt, 1, a, prev_path1))
1555 if (update_file(opt, 1, a, collide_path))
1559 /* Put second file (b->oid, b->mode) in its original spot */
1561 if (update_file(opt, 1, b, prev_path2))
1564 if (update_file(opt, 1, b, collide_path))
1568 /* Don't leave something at collision path if unrenaming both */
1569 if (prev_path1 && prev_path2)
1570 remove_file(opt, 1, collide_path, 0);
1575 /* Remove rename sources if rename/add or rename/rename(2to1) */
1577 remove_file(opt, 1, prev_path1,
1578 opt->call_depth || would_lose_untracked(opt, prev_path1));
1580 remove_file(opt, 1, prev_path2,
1581 opt->call_depth || would_lose_untracked(opt, prev_path2));
1584 * Remove the collision path, if it wouldn't cause dirty contents
1585 * or an untracked file to get lost. We'll either overwrite with
1586 * merged contents, or just write out to differently named files.
1588 if (was_dirty(opt, collide_path)) {
1589 output(opt, 1, _("Refusing to lose dirty file at %s"),
1591 update_path = alt_path = unique_path(opt, collide_path, "merged");
1592 } else if (would_lose_untracked(opt, collide_path)) {
1594 * Only way we get here is if both renames were from
1595 * a directory rename AND user had an untracked file
1596 * at the location where both files end up after the
1597 * two directory renames. See testcase 10d of t6043.
1599 output(opt, 1, _("Refusing to lose untracked file at "
1600 "%s, even though it's in the way."),
1602 update_path = alt_path = unique_path(opt, collide_path, "merged");
1605 * FIXME: It's possible that the two files are identical
1606 * and that the current working copy happens to match, in
1607 * which case we are unnecessarily touching the working
1608 * tree file. It's not a likely enough scenario that I
1609 * want to code up the checks for it and a better fix is
1610 * available if we restructure how unpack_trees() and
1611 * merge-recursive interoperate anyway, so punting for
1614 remove_file(opt, 0, collide_path, 0);
1617 /* Store things in diff_filespecs for functions that need it */
1618 null.path = (char *)collide_path;
1619 oidcpy(&null.oid, &null_oid);
1622 if (merge_mode_and_contents(opt, &null, a, b, collide_path,
1623 branch1, branch2, opt->call_depth * 2, &mfi))
1625 mfi.clean &= !alt_path;
1626 if (update_file(opt, mfi.clean, &mfi.blob, update_path))
1628 if (!mfi.clean && !opt->call_depth &&
1629 update_stages(opt, collide_path, NULL, a, b))
1633 * FIXME: If both a & b both started with conflicts (only possible
1634 * if they came from a rename/rename(2to1)), but had IDENTICAL
1635 * contents including those conflicts, then in the next line we claim
1636 * it was clean. If someone cares about this case, we should have the
1637 * caller notify us if we started with conflicts.
1642 static int handle_rename_add(struct merge_options *opt,
1643 struct rename_conflict_info *ci)
1645 /* a was renamed to c, and a separate c was added. */
1646 struct diff_filespec *a = ci->ren1->pair->one;
1647 struct diff_filespec *c = ci->ren1->pair->two;
1648 char *path = c->path;
1649 char *prev_path_desc;
1650 struct merge_file_info mfi;
1652 const char *rename_branch = ci->ren1->branch;
1653 const char *add_branch = (opt->branch1 == rename_branch ?
1654 opt->branch2 : opt->branch1);
1655 int other_stage = (ci->ren1->branch == opt->branch1 ? 3 : 2);
1657 output(opt, 1, _("CONFLICT (rename/add): "
1658 "Rename %s->%s in %s. Added %s in %s"),
1659 a->path, c->path, rename_branch,
1660 c->path, add_branch);
1662 prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
1663 if (merge_mode_and_contents(opt, a, c,
1664 &ci->ren1->src_entry->stages[other_stage],
1666 opt->branch1, opt->branch2,
1667 1 + opt->call_depth * 2, &mfi))
1669 free(prev_path_desc);
1671 ci->ren1->dst_entry->stages[other_stage].path = mfi.blob.path = c->path;
1672 return handle_file_collision(opt,
1673 c->path, a->path, NULL,
1674 rename_branch, add_branch,
1676 &ci->ren1->dst_entry->stages[other_stage]);
1679 static char *find_path_for_conflict(struct merge_options *opt,
1681 const char *branch1,
1682 const char *branch2)
1684 char *new_path = NULL;
1685 if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0)) {
1686 new_path = unique_path(opt, path, branch1);
1687 output(opt, 1, _("%s is a directory in %s adding "
1689 path, branch2, new_path);
1690 } else if (would_lose_untracked(opt, path)) {
1691 new_path = unique_path(opt, path, branch1);
1692 output(opt, 1, _("Refusing to lose untracked file"
1693 " at %s; adding as %s instead"),
1700 static int handle_rename_rename_1to2(struct merge_options *opt,
1701 struct rename_conflict_info *ci)
1703 /* One file was renamed in both branches, but to different names. */
1704 struct merge_file_info mfi;
1705 struct diff_filespec *add;
1706 struct diff_filespec *o = ci->ren1->pair->one;
1707 struct diff_filespec *a = ci->ren1->pair->two;
1708 struct diff_filespec *b = ci->ren2->pair->two;
1711 output(opt, 1, _("CONFLICT (rename/rename): "
1712 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1713 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1714 o->path, a->path, ci->ren1->branch,
1715 o->path, b->path, ci->ren2->branch,
1716 opt->call_depth ? _(" (left unresolved)") : "");
1718 path_desc = xstrfmt("%s and %s, both renamed from %s",
1719 a->path, b->path, o->path);
1720 if (merge_mode_and_contents(opt, o, a, b, path_desc,
1721 ci->ren1->branch, ci->ren2->branch,
1722 opt->call_depth * 2, &mfi))
1726 if (opt->call_depth) {
1728 * FIXME: For rename/add-source conflicts (if we could detect
1729 * such), this is wrong. We should instead find a unique
1730 * pathname and then either rename the add-source file to that
1731 * unique path, or use that unique path instead of src here.
1733 if (update_file(opt, 0, &mfi.blob, o->path))
1737 * Above, we put the merged content at the merge-base's
1738 * path. Now we usually need to delete both a->path and
1739 * b->path. However, the rename on each side of the merge
1740 * could also be involved in a rename/add conflict. In
1741 * such cases, we should keep the added file around,
1742 * resolving the conflict at that path in its favor.
1744 add = &ci->ren1->dst_entry->stages[2 ^ 1];
1745 if (is_valid(add)) {
1746 if (update_file(opt, 0, add, a->path))
1750 remove_file_from_index(opt->repo->index, a->path);
1751 add = &ci->ren2->dst_entry->stages[3 ^ 1];
1752 if (is_valid(add)) {
1753 if (update_file(opt, 0, add, b->path))
1757 remove_file_from_index(opt->repo->index, b->path);
1760 * For each destination path, we need to see if there is a
1761 * rename/add collision. If not, we can write the file out
1762 * to the specified location.
1764 add = &ci->ren1->dst_entry->stages[2 ^ 1];
1765 if (is_valid(add)) {
1766 add->path = mfi.blob.path = a->path;
1767 if (handle_file_collision(opt, a->path,
1771 &mfi.blob, add) < 0)
1774 char *new_path = find_path_for_conflict(opt, a->path,
1777 if (update_file(opt, 0, &mfi.blob,
1778 new_path ? new_path : a->path))
1781 if (update_stages(opt, a->path, NULL, a, NULL))
1785 add = &ci->ren2->dst_entry->stages[3 ^ 1];
1786 if (is_valid(add)) {
1787 add->path = mfi.blob.path = b->path;
1788 if (handle_file_collision(opt, b->path,
1792 add, &mfi.blob) < 0)
1795 char *new_path = find_path_for_conflict(opt, b->path,
1798 if (update_file(opt, 0, &mfi.blob,
1799 new_path ? new_path : b->path))
1802 if (update_stages(opt, b->path, NULL, NULL, b))
1810 static int handle_rename_rename_2to1(struct merge_options *opt,
1811 struct rename_conflict_info *ci)
1813 /* Two files, a & b, were renamed to the same thing, c. */
1814 struct diff_filespec *a = ci->ren1->pair->one;
1815 struct diff_filespec *b = ci->ren2->pair->one;
1816 struct diff_filespec *c1 = ci->ren1->pair->two;
1817 struct diff_filespec *c2 = ci->ren2->pair->two;
1818 char *path = c1->path; /* == c2->path */
1819 char *path_side_1_desc;
1820 char *path_side_2_desc;
1821 struct merge_file_info mfi_c1;
1822 struct merge_file_info mfi_c2;
1823 int ostage1, ostage2;
1825 output(opt, 1, _("CONFLICT (rename/rename): "
1826 "Rename %s->%s in %s. "
1827 "Rename %s->%s in %s"),
1828 a->path, c1->path, ci->ren1->branch,
1829 b->path, c2->path, ci->ren2->branch);
1831 path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
1832 path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
1833 ostage1 = ci->ren1->branch == opt->branch1 ? 3 : 2;
1834 ostage2 = ostage1 ^ 1;
1835 ci->ren1->src_entry->stages[ostage1].path = a->path;
1836 ci->ren2->src_entry->stages[ostage2].path = b->path;
1837 if (merge_mode_and_contents(opt, a, c1,
1838 &ci->ren1->src_entry->stages[ostage1],
1840 opt->branch1, opt->branch2,
1841 1 + opt->call_depth * 2, &mfi_c1) ||
1842 merge_mode_and_contents(opt, b,
1843 &ci->ren2->src_entry->stages[ostage2],
1844 c2, path_side_2_desc,
1845 opt->branch1, opt->branch2,
1846 1 + opt->call_depth * 2, &mfi_c2))
1848 free(path_side_1_desc);
1849 free(path_side_2_desc);
1850 mfi_c1.blob.path = path;
1851 mfi_c2.blob.path = path;
1853 return handle_file_collision(opt, path, a->path, b->path,
1854 ci->ren1->branch, ci->ren2->branch,
1855 &mfi_c1.blob, &mfi_c2.blob);
1859 * Get the diff_filepairs changed between o_tree and tree.
1861 static struct diff_queue_struct *get_diffpairs(struct merge_options *opt,
1862 struct tree *o_tree,
1865 struct diff_queue_struct *ret;
1866 struct diff_options opts;
1868 repo_diff_setup(opt->repo, &opts);
1869 opts.flags.recursive = 1;
1870 opts.flags.rename_empty = 0;
1871 opts.detect_rename = merge_detect_rename(opt);
1873 * We do not have logic to handle the detection of copies. In
1874 * fact, it may not even make sense to add such logic: would we
1875 * really want a change to a base file to be propagated through
1876 * multiple other files by a merge?
1878 if (opts.detect_rename > DIFF_DETECT_RENAME)
1879 opts.detect_rename = DIFF_DETECT_RENAME;
1880 opts.rename_limit = opt->merge_rename_limit >= 0 ? opt->merge_rename_limit :
1881 opt->diff_rename_limit >= 0 ? opt->diff_rename_limit :
1883 opts.rename_score = opt->rename_score;
1884 opts.show_rename_progress = opt->show_rename_progress;
1885 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1886 diff_setup_done(&opts);
1887 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1888 diffcore_std(&opts);
1889 if (opts.needed_rename_limit > opt->needed_rename_limit)
1890 opt->needed_rename_limit = opts.needed_rename_limit;
1892 ret = xmalloc(sizeof(*ret));
1893 *ret = diff_queued_diff;
1895 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1896 diff_queued_diff.nr = 0;
1897 diff_queued_diff.queue = NULL;
1902 static int tree_has_path(struct tree *tree, const char *path)
1904 struct object_id hashy;
1905 unsigned short mode_o;
1907 return !get_tree_entry(&tree->object.oid, path,
1912 * Return a new string that replaces the beginning portion (which matches
1913 * entry->dir), with entry->new_dir. In perl-speak:
1914 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1916 * Caller must ensure that old_path starts with entry->dir + '/'.
1918 static char *apply_dir_rename(struct dir_rename_entry *entry,
1919 const char *old_path)
1921 struct strbuf new_path = STRBUF_INIT;
1924 if (entry->non_unique_new_dir)
1927 oldlen = strlen(entry->dir);
1928 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
1929 strbuf_grow(&new_path, newlen);
1930 strbuf_addbuf(&new_path, &entry->new_dir);
1931 strbuf_addstr(&new_path, &old_path[oldlen]);
1933 return strbuf_detach(&new_path, NULL);
1936 static void get_renamed_dir_portion(const char *old_path, const char *new_path,
1937 char **old_dir, char **new_dir)
1939 char *end_of_old, *end_of_new;
1940 int old_len, new_len;
1947 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1948 * the "e/foo.c" part is the same, we just want to know that
1949 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1950 * so, for this example, this function returns "a/b/c/d" in
1951 * *old_dir and "a/b/some/thing/else" in *new_dir.
1953 * Also, if the basename of the file changed, we don't care. We
1954 * want to know which portion of the directory, if any, changed.
1956 end_of_old = strrchr(old_path, '/');
1957 end_of_new = strrchr(new_path, '/');
1959 if (end_of_old == NULL || end_of_new == NULL)
1961 while (*--end_of_new == *--end_of_old &&
1962 end_of_old != old_path &&
1963 end_of_new != new_path)
1964 ; /* Do nothing; all in the while loop */
1966 * We've found the first non-matching character in the directory
1967 * paths. That means the current directory we were comparing
1968 * represents the rename. Move end_of_old and end_of_new back
1969 * to the full directory name.
1971 if (*end_of_old == '/')
1973 if (*end_of_old != '/')
1975 end_of_old = strchr(end_of_old, '/');
1976 end_of_new = strchr(end_of_new, '/');
1979 * It may have been the case that old_path and new_path were the same
1980 * directory all along. Don't claim a rename if they're the same.
1982 old_len = end_of_old - old_path;
1983 new_len = end_of_new - new_path;
1985 if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
1986 *old_dir = xstrndup(old_path, old_len);
1987 *new_dir = xstrndup(new_path, new_len);
1991 static void remove_hashmap_entries(struct hashmap *dir_renames,
1992 struct string_list *items_to_remove)
1995 struct dir_rename_entry *entry;
1997 for (i = 0; i < items_to_remove->nr; i++) {
1998 entry = items_to_remove->items[i].util;
1999 hashmap_remove(dir_renames, entry, NULL);
2001 string_list_clear(items_to_remove, 0);
2005 * See if there is a directory rename for path, and if there are any file
2006 * level conflicts for the renamed location. If there is a rename and
2007 * there are no conflicts, return the new name. Otherwise, return NULL.
2009 static char *handle_path_level_conflicts(struct merge_options *opt,
2011 struct dir_rename_entry *entry,
2012 struct hashmap *collisions,
2015 char *new_path = NULL;
2016 struct collision_entry *collision_ent;
2018 struct strbuf collision_paths = STRBUF_INIT;
2021 * entry has the mapping of old directory name to new directory name
2022 * that we want to apply to path.
2024 new_path = apply_dir_rename(entry, path);
2027 /* This should only happen when entry->non_unique_new_dir set */
2028 if (!entry->non_unique_new_dir)
2029 BUG("entry->non_unqiue_dir not set and !new_path");
2030 output(opt, 1, _("CONFLICT (directory rename split): "
2031 "Unclear where to place %s because directory "
2032 "%s was renamed to multiple other directories, "
2033 "with no destination getting a majority of the "
2041 * The caller needs to have ensured that it has pre-populated
2042 * collisions with all paths that map to new_path. Do a quick check
2043 * to ensure that's the case.
2045 collision_ent = collision_find_entry(collisions, new_path);
2046 if (collision_ent == NULL)
2047 BUG("collision_ent is NULL");
2050 * Check for one-sided add/add/.../add conflicts, i.e.
2051 * where implicit renames from the other side doing
2052 * directory rename(s) can affect this side of history
2053 * to put multiple paths into the same location. Warn
2054 * and bail on directory renames for such paths.
2056 if (collision_ent->reported_already) {
2058 } else if (tree_has_path(tree, new_path)) {
2059 collision_ent->reported_already = 1;
2060 strbuf_add_separated_string_list(&collision_paths, ", ",
2061 &collision_ent->source_files);
2062 output(opt, 1, _("CONFLICT (implicit dir rename): Existing "
2063 "file/dir at %s in the way of implicit "
2064 "directory rename(s) putting the following "
2065 "path(s) there: %s."),
2066 new_path, collision_paths.buf);
2068 } else if (collision_ent->source_files.nr > 1) {
2069 collision_ent->reported_already = 1;
2070 strbuf_add_separated_string_list(&collision_paths, ", ",
2071 &collision_ent->source_files);
2072 output(opt, 1, _("CONFLICT (implicit dir rename): Cannot map "
2073 "more than one path to %s; implicit directory "
2074 "renames tried to put these paths there: %s"),
2075 new_path, collision_paths.buf);
2079 /* Free memory we no longer need */
2080 strbuf_release(&collision_paths);
2081 if (!clean && new_path) {
2090 * There are a couple things we want to do at the directory level:
2091 * 1. Check for both sides renaming to the same thing, in order to avoid
2092 * implicit renaming of files that should be left in place. (See
2093 * testcase 6b in t6043 for details.)
2094 * 2. Prune directory renames if there are still files left in the
2095 * the original directory. These represent a partial directory rename,
2096 * i.e. a rename where only some of the files within the directory
2097 * were renamed elsewhere. (Technically, this could be done earlier
2098 * in get_directory_renames(), except that would prevent us from
2099 * doing the previous check and thus failing testcase 6b.)
2100 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2101 * In the future, we could potentially record this info as well and
2102 * omit reporting rename/rename(1to2) conflicts for each path within
2103 * the affected directories, thus cleaning up the merge output.
2104 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2105 * directory level, because merging directories is fine. If it
2106 * causes conflicts for files within those merged directories, then
2107 * that should be detected at the individual path level.
2109 static void handle_directory_level_conflicts(struct merge_options *opt,
2110 struct hashmap *dir_re_head,
2112 struct hashmap *dir_re_merge,
2115 struct hashmap_iter iter;
2116 struct dir_rename_entry *head_ent;
2117 struct dir_rename_entry *merge_ent;
2119 struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
2120 struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
2122 hashmap_iter_init(dir_re_head, &iter);
2123 while ((head_ent = hashmap_iter_next(&iter))) {
2124 merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
2126 !head_ent->non_unique_new_dir &&
2127 !merge_ent->non_unique_new_dir &&
2128 !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
2129 /* 1. Renamed identically; remove it from both sides */
2130 string_list_append(&remove_from_head,
2131 head_ent->dir)->util = head_ent;
2132 strbuf_release(&head_ent->new_dir);
2133 string_list_append(&remove_from_merge,
2134 merge_ent->dir)->util = merge_ent;
2135 strbuf_release(&merge_ent->new_dir);
2136 } else if (tree_has_path(head, head_ent->dir)) {
2137 /* 2. This wasn't a directory rename after all */
2138 string_list_append(&remove_from_head,
2139 head_ent->dir)->util = head_ent;
2140 strbuf_release(&head_ent->new_dir);
2144 remove_hashmap_entries(dir_re_head, &remove_from_head);
2145 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2147 hashmap_iter_init(dir_re_merge, &iter);
2148 while ((merge_ent = hashmap_iter_next(&iter))) {
2149 head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
2150 if (tree_has_path(merge, merge_ent->dir)) {
2151 /* 2. This wasn't a directory rename after all */
2152 string_list_append(&remove_from_merge,
2153 merge_ent->dir)->util = merge_ent;
2154 } else if (head_ent &&
2155 !head_ent->non_unique_new_dir &&
2156 !merge_ent->non_unique_new_dir) {
2157 /* 3. rename/rename(1to2) */
2159 * We can assume it's not rename/rename(1to1) because
2160 * that was case (1), already checked above. So we
2161 * know that head_ent->new_dir and merge_ent->new_dir
2162 * are different strings.
2164 output(opt, 1, _("CONFLICT (rename/rename): "
2165 "Rename directory %s->%s in %s. "
2166 "Rename directory %s->%s in %s"),
2167 head_ent->dir, head_ent->new_dir.buf, opt->branch1,
2168 head_ent->dir, merge_ent->new_dir.buf, opt->branch2);
2169 string_list_append(&remove_from_head,
2170 head_ent->dir)->util = head_ent;
2171 strbuf_release(&head_ent->new_dir);
2172 string_list_append(&remove_from_merge,
2173 merge_ent->dir)->util = merge_ent;
2174 strbuf_release(&merge_ent->new_dir);
2178 remove_hashmap_entries(dir_re_head, &remove_from_head);
2179 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2182 static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
2184 struct hashmap *dir_renames;
2185 struct hashmap_iter iter;
2186 struct dir_rename_entry *entry;
2190 * Typically, we think of a directory rename as all files from a
2191 * certain directory being moved to a target directory. However,
2192 * what if someone first moved two files from the original
2193 * directory in one commit, and then renamed the directory
2194 * somewhere else in a later commit? At merge time, we just know
2195 * that files from the original directory went to two different
2196 * places, and that the bulk of them ended up in the same place.
2197 * We want each directory rename to represent where the bulk of the
2198 * files from that directory end up; this function exists to find
2199 * where the bulk of the files went.
2201 * The first loop below simply iterates through the list of file
2202 * renames, finding out how often each directory rename pair
2203 * possibility occurs.
2205 dir_renames = xmalloc(sizeof(*dir_renames));
2206 dir_rename_init(dir_renames);
2207 for (i = 0; i < pairs->nr; ++i) {
2208 struct string_list_item *item;
2210 struct diff_filepair *pair = pairs->queue[i];
2211 char *old_dir, *new_dir;
2213 /* File not part of directory rename if it wasn't renamed */
2214 if (pair->status != 'R')
2217 get_renamed_dir_portion(pair->one->path, pair->two->path,
2218 &old_dir, &new_dir);
2220 /* Directory didn't change at all; ignore this one. */
2223 entry = dir_rename_find_entry(dir_renames, old_dir);
2225 entry = xmalloc(sizeof(*entry));
2226 dir_rename_entry_init(entry, old_dir);
2227 hashmap_put(dir_renames, entry);
2231 item = string_list_lookup(&entry->possible_new_dirs, new_dir);
2233 item = string_list_insert(&entry->possible_new_dirs,
2235 item->util = xcalloc(1, sizeof(int));
2244 * For each directory with files moved out of it, we find out which
2245 * target directory received the most files so we can declare it to
2246 * be the "winning" target location for the directory rename. This
2247 * winner gets recorded in new_dir. If there is no winner
2248 * (multiple target directories received the same number of files),
2249 * we set non_unique_new_dir. Once we've determined the winner (or
2250 * that there is no winner), we no longer need possible_new_dirs.
2252 hashmap_iter_init(dir_renames, &iter);
2253 while ((entry = hashmap_iter_next(&iter))) {
2258 for (i = 0; i < entry->possible_new_dirs.nr; i++) {
2259 int *count = entry->possible_new_dirs.items[i].util;
2263 else if (*count > max) {
2265 best = entry->possible_new_dirs.items[i].string;
2269 entry->non_unique_new_dir = 1;
2271 assert(entry->new_dir.len == 0);
2272 strbuf_addstr(&entry->new_dir, best);
2275 * The relevant directory sub-portion of the original full
2276 * filepaths were xstrndup'ed before inserting into
2277 * possible_new_dirs, and instead of manually iterating the
2278 * list and free'ing each, just lie and tell
2279 * possible_new_dirs that it did the strdup'ing so that it
2280 * will free them for us.
2282 entry->possible_new_dirs.strdup_strings = 1;
2283 string_list_clear(&entry->possible_new_dirs, 1);
2289 static struct dir_rename_entry *check_dir_renamed(const char *path,
2290 struct hashmap *dir_renames)
2292 char *temp = xstrdup(path);
2294 struct dir_rename_entry *entry = NULL;
2296 while ((end = strrchr(temp, '/'))) {
2298 entry = dir_rename_find_entry(dir_renames, temp);
2306 static void compute_collisions(struct hashmap *collisions,
2307 struct hashmap *dir_renames,
2308 struct diff_queue_struct *pairs)
2313 * Multiple files can be mapped to the same path due to directory
2314 * renames done by the other side of history. Since that other
2315 * side of history could have merged multiple directories into one,
2316 * if our side of history added the same file basename to each of
2317 * those directories, then all N of them would get implicitly
2318 * renamed by the directory rename detection into the same path,
2319 * and we'd get an add/add/.../add conflict, and all those adds
2320 * from *this* side of history. This is not representable in the
2321 * index, and users aren't going to easily be able to make sense of
2322 * it. So we need to provide a good warning about what's
2323 * happening, and fall back to no-directory-rename detection
2324 * behavior for those paths.
2326 * See testcases 9e and all of section 5 from t6043 for examples.
2328 collision_init(collisions);
2330 for (i = 0; i < pairs->nr; ++i) {
2331 struct dir_rename_entry *dir_rename_ent;
2332 struct collision_entry *collision_ent;
2334 struct diff_filepair *pair = pairs->queue[i];
2336 if (pair->status != 'A' && pair->status != 'R')
2338 dir_rename_ent = check_dir_renamed(pair->two->path,
2340 if (!dir_rename_ent)
2343 new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
2346 * dir_rename_ent->non_unique_new_path is true, which
2347 * means there is no directory rename for us to use,
2348 * which means it won't cause us any additional
2352 collision_ent = collision_find_entry(collisions, new_path);
2353 if (!collision_ent) {
2354 collision_ent = xcalloc(1,
2355 sizeof(struct collision_entry));
2356 hashmap_entry_init(collision_ent, strhash(new_path));
2357 hashmap_put(collisions, collision_ent);
2358 collision_ent->target_file = new_path;
2362 string_list_insert(&collision_ent->source_files,
2367 static char *check_for_directory_rename(struct merge_options *opt,
2370 struct hashmap *dir_renames,
2371 struct hashmap *dir_rename_exclusions,
2372 struct hashmap *collisions,
2375 char *new_path = NULL;
2376 struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames);
2377 struct dir_rename_entry *oentry = NULL;
2383 * This next part is a little weird. We do not want to do an
2384 * implicit rename into a directory we renamed on our side, because
2385 * that will result in a spurious rename/rename(1to2) conflict. An
2387 * Base commit: dumbdir/afile, otherdir/bfile
2388 * Side 1: smrtdir/afile, otherdir/bfile
2389 * Side 2: dumbdir/afile, dumbdir/bfile
2390 * Here, while working on Side 1, we could notice that otherdir was
2391 * renamed/merged to dumbdir, and change the diff_filepair for
2392 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2393 * 2 will notice the rename from dumbdir to smrtdir, and do the
2394 * transitive rename to move it from dumbdir/bfile to
2395 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2396 * smrtdir, a rename/rename(1to2) conflict. We really just want
2397 * the file to end up in smrtdir. And the way to achieve that is
2398 * to not let Side1 do the rename to dumbdir, since we know that is
2399 * the source of one of our directory renames.
2401 * That's why oentry and dir_rename_exclusions is here.
2403 * As it turns out, this also prevents N-way transient rename
2404 * confusion; See testcases 9c and 9d of t6043.
2406 oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
2408 output(opt, 1, _("WARNING: Avoiding applying %s -> %s rename "
2409 "to %s, because %s itself was renamed."),
2410 entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
2412 new_path = handle_path_level_conflicts(opt, path, entry,
2414 *clean_merge &= (new_path != NULL);
2420 static void apply_directory_rename_modifications(struct merge_options *opt,
2421 struct diff_filepair *pair,
2425 struct tree *o_tree,
2426 struct tree *a_tree,
2427 struct tree *b_tree,
2428 struct string_list *entries)
2430 struct string_list_item *item;
2431 int stage = (tree == a_tree ? 2 : 3);
2435 * In all cases where we can do directory rename detection,
2436 * unpack_trees() will have read pair->two->path into the
2437 * index and the working copy. We need to remove it so that
2438 * we can instead place it at new_path. It is guaranteed to
2439 * not be untracked (unpack_trees() would have errored out
2440 * saying the file would have been overwritten), but it might
2443 update_wd = !was_dirty(opt, pair->two->path);
2445 output(opt, 1, _("Refusing to lose dirty file at %s"),
2447 remove_file(opt, 1, pair->two->path, !update_wd);
2449 /* Find or create a new re->dst_entry */
2450 item = string_list_lookup(entries, new_path);
2453 * Since we're renaming on this side of history, and it's
2454 * due to a directory rename on the other side of history
2455 * (which we only allow when the directory in question no
2456 * longer exists on the other side of history), the
2457 * original entry for re->dst_entry is no longer
2460 re->dst_entry->processed = 1;
2463 * ...because we'll be using this new one.
2465 re->dst_entry = item->util;
2468 * re->dst_entry is for the before-dir-rename path, and we
2469 * need it to hold information for the after-dir-rename
2470 * path. Before creating a new entry, we need to mark the
2471 * old one as unnecessary (...unless it is shared by
2472 * src_entry, i.e. this didn't use to be a rename, in which
2473 * case we can just allow the normal processing to happen
2476 if (pair->status == 'R')
2477 re->dst_entry->processed = 1;
2479 re->dst_entry = insert_stage_data(new_path,
2480 o_tree, a_tree, b_tree,
2482 item = string_list_insert(entries, new_path);
2483 item->util = re->dst_entry;
2487 * Update the stage_data with the information about the path we are
2488 * moving into place. That slot will be empty and available for us
2489 * to write to because of the collision checks in
2490 * handle_path_level_conflicts(). In other words,
2491 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2492 * open for us to write to.
2494 * It may be tempting to actually update the index at this point as
2495 * well, using update_stages_for_stage_data(), but as per the big
2496 * "NOTE" in update_stages(), doing so will modify the current
2497 * in-memory index which will break calls to would_lose_untracked()
2498 * that we need to make. Instead, we need to just make sure that
2499 * the various handle_rename_*() functions update the index
2500 * explicitly rather than relying on unpack_trees() to have done it.
2502 get_tree_entry(&tree->object.oid,
2504 &re->dst_entry->stages[stage].oid,
2505 &re->dst_entry->stages[stage].mode);
2508 * Record the original change status (or 'type' of change). If it
2509 * was originally an add ('A'), this lets us differentiate later
2510 * between a RENAME_DELETE conflict and RENAME_VIA_DIR (they
2511 * otherwise look the same). If it was originally a rename ('R'),
2512 * this lets us remember and report accurately about the transitive
2513 * renaming that occurred via the directory rename detection. Also,
2514 * record the original destination name.
2516 re->dir_rename_original_type = pair->status;
2517 re->dir_rename_original_dest = pair->two->path;
2520 * We don't actually look at pair->status again, but it seems
2521 * pedagogically correct to adjust it.
2526 * Finally, record the new location.
2528 pair->two->path = new_path;
2532 * Get information of all renames which occurred in 'pairs', making use of
2533 * any implicit directory renames inferred from the other side of history.
2534 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2535 * to be able to associate the correct cache entries with the rename
2536 * information; tree is always equal to either a_tree or b_tree.
2538 static struct string_list *get_renames(struct merge_options *opt,
2540 struct diff_queue_struct *pairs,
2541 struct hashmap *dir_renames,
2542 struct hashmap *dir_rename_exclusions,
2544 struct tree *o_tree,
2545 struct tree *a_tree,
2546 struct tree *b_tree,
2547 struct string_list *entries,
2551 struct hashmap collisions;
2552 struct hashmap_iter iter;
2553 struct collision_entry *e;
2554 struct string_list *renames;
2556 compute_collisions(&collisions, dir_renames, pairs);
2557 renames = xcalloc(1, sizeof(struct string_list));
2559 for (i = 0; i < pairs->nr; ++i) {
2560 struct string_list_item *item;
2562 struct diff_filepair *pair = pairs->queue[i];
2563 char *new_path; /* non-NULL only with directory renames */
2565 if (pair->status != 'A' && pair->status != 'R') {
2566 diff_free_filepair(pair);
2569 new_path = check_for_directory_rename(opt, pair->two->path, tree,
2571 dir_rename_exclusions,
2574 if (pair->status != 'R' && !new_path) {
2575 diff_free_filepair(pair);
2579 re = xmalloc(sizeof(*re));
2582 re->branch = branch;
2583 re->dir_rename_original_type = '\0';
2584 re->dir_rename_original_dest = NULL;
2585 item = string_list_lookup(entries, re->pair->one->path);
2587 re->src_entry = insert_stage_data(re->pair->one->path,
2588 o_tree, a_tree, b_tree, entries);
2590 re->src_entry = item->util;
2592 item = string_list_lookup(entries, re->pair->two->path);
2594 re->dst_entry = insert_stage_data(re->pair->two->path,
2595 o_tree, a_tree, b_tree, entries);
2597 re->dst_entry = item->util;
2598 item = string_list_insert(renames, pair->one->path);
2601 apply_directory_rename_modifications(opt, pair, new_path,
2607 hashmap_iter_init(&collisions, &iter);
2608 while ((e = hashmap_iter_next(&iter))) {
2609 free(e->target_file);
2610 string_list_clear(&e->source_files, 0);
2612 hashmap_free(&collisions, 1);
2616 static int process_renames(struct merge_options *opt,
2617 struct string_list *a_renames,
2618 struct string_list *b_renames)
2620 int clean_merge = 1, i, j;
2621 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
2622 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
2623 const struct rename *sre;
2625 for (i = 0; i < a_renames->nr; i++) {
2626 sre = a_renames->items[i].util;
2627 string_list_insert(&a_by_dst, sre->pair->two->path)->util
2630 for (i = 0; i < b_renames->nr; i++) {
2631 sre = b_renames->items[i].util;
2632 string_list_insert(&b_by_dst, sre->pair->two->path)->util
2636 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
2637 struct string_list *renames1, *renames2Dst;
2638 struct rename *ren1 = NULL, *ren2 = NULL;
2639 const char *ren1_src, *ren1_dst;
2640 struct string_list_item *lookup;
2642 if (i >= a_renames->nr) {
2643 ren2 = b_renames->items[j++].util;
2644 } else if (j >= b_renames->nr) {
2645 ren1 = a_renames->items[i++].util;
2647 int compare = strcmp(a_renames->items[i].string,
2648 b_renames->items[j].string);
2650 ren1 = a_renames->items[i++].util;
2652 ren2 = b_renames->items[j++].util;
2655 /* TODO: refactor, so that 1/2 are not needed */
2657 renames1 = a_renames;
2658 renames2Dst = &b_by_dst;
2660 renames1 = b_renames;
2661 renames2Dst = &a_by_dst;
2665 if (ren1->processed)
2667 ren1->processed = 1;
2668 ren1->dst_entry->processed = 1;
2669 /* BUG: We should only mark src_entry as processed if we
2670 * are not dealing with a rename + add-source case.
2672 ren1->src_entry->processed = 1;
2674 ren1_src = ren1->pair->one->path;
2675 ren1_dst = ren1->pair->two->path;
2678 /* One file renamed on both sides */
2679 const char *ren2_src = ren2->pair->one->path;
2680 const char *ren2_dst = ren2->pair->two->path;
2681 enum rename_type rename_type;
2682 if (strcmp(ren1_src, ren2_src) != 0)
2683 BUG("ren1_src != ren2_src");
2684 ren2->dst_entry->processed = 1;
2685 ren2->processed = 1;
2686 if (strcmp(ren1_dst, ren2_dst) != 0) {
2687 rename_type = RENAME_ONE_FILE_TO_TWO;
2690 rename_type = RENAME_ONE_FILE_TO_ONE;
2691 /* BUG: We should only remove ren1_src in
2692 * the base stage (think of rename +
2693 * add-source cases).
2695 remove_file(opt, 1, ren1_src, 1);
2696 update_entry(ren1->dst_entry,
2701 setup_rename_conflict_info(rename_type, opt, ren1, ren2);
2702 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
2703 /* Two different files renamed to the same thing */
2705 ren2 = lookup->util;
2706 ren2_dst = ren2->pair->two->path;
2707 if (strcmp(ren1_dst, ren2_dst) != 0)
2708 BUG("ren1_dst != ren2_dst");
2711 ren2->processed = 1;
2713 * BUG: We should only mark src_entry as processed
2714 * if we are not dealing with a rename + add-source
2717 ren2->src_entry->processed = 1;
2719 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
2722 /* Renamed in 1, maybe changed in 2 */
2723 /* we only use sha1 and mode of these */
2724 struct diff_filespec src_other, dst_other;
2728 * unpack_trees loads entries from common-commit
2729 * into stage 1, from head-commit into stage 2, and
2730 * from merge-commit into stage 3. We keep track
2731 * of which side corresponds to the rename.
2733 int renamed_stage = a_renames == renames1 ? 2 : 3;
2734 int other_stage = a_renames == renames1 ? 3 : 2;
2736 /* BUG: We should only remove ren1_src in the base
2737 * stage and in other_stage (think of rename +
2740 remove_file(opt, 1, ren1_src,
2741 renamed_stage == 2 || !was_tracked(opt, ren1_src));
2743 oidcpy(&src_other.oid,
2744 &ren1->src_entry->stages[other_stage].oid);
2745 src_other.mode = ren1->src_entry->stages[other_stage].mode;
2746 oidcpy(&dst_other.oid,
2747 &ren1->dst_entry->stages[other_stage].oid);
2748 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
2751 if (oid_eq(&src_other.oid, &null_oid) &&
2752 ren1->dir_rename_original_type == 'A') {
2753 setup_rename_conflict_info(RENAME_VIA_DIR,
2755 } else if (oid_eq(&src_other.oid, &null_oid)) {
2756 setup_rename_conflict_info(RENAME_DELETE,
2758 } else if ((dst_other.mode == ren1->pair->two->mode) &&
2759 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
2761 * Added file on the other side identical to
2762 * the file being renamed: clean merge.
2763 * Also, there is no need to overwrite the
2764 * file already in the working copy, so call
2765 * update_file_flags() instead of
2768 if (update_file_flags(opt,
2771 1, /* update_cache */
2774 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
2776 * Probably not a clean merge, but it's
2777 * premature to set clean_merge to 0 here,
2778 * because if the rename merges cleanly and
2779 * the merge exactly matches the newly added
2780 * file, then the merge will be clean.
2782 setup_rename_conflict_info(RENAME_ADD,
2787 if (clean_merge < 0)
2788 goto cleanup_and_return;
2790 struct diff_filespec *o, *a, *b;
2791 src_other.path = (char *)ren1_src;
2793 o = ren1->pair->one;
2794 if (a_renames == renames1) {
2795 a = ren1->pair->two;
2798 b = ren1->pair->two;
2801 update_entry(ren1->dst_entry, o, a, b);
2802 setup_rename_conflict_info(RENAME_NORMAL,
2808 string_list_clear(&a_by_dst, 0);
2809 string_list_clear(&b_by_dst, 0);
2814 struct rename_info {
2815 struct string_list *head_renames;
2816 struct string_list *merge_renames;
2819 static void initial_cleanup_rename(struct diff_queue_struct *pairs,
2820 struct hashmap *dir_renames)
2822 struct hashmap_iter iter;
2823 struct dir_rename_entry *e;
2825 hashmap_iter_init(dir_renames, &iter);
2826 while ((e = hashmap_iter_next(&iter))) {
2828 strbuf_release(&e->new_dir);
2829 /* possible_new_dirs already cleared in get_directory_renames */
2831 hashmap_free(dir_renames, 1);
2838 static int detect_and_process_renames(struct merge_options *opt,
2839 struct tree *common,
2842 struct string_list *entries,
2843 struct rename_info *ri)
2845 struct diff_queue_struct *head_pairs, *merge_pairs;
2846 struct hashmap *dir_re_head, *dir_re_merge;
2849 ri->head_renames = NULL;
2850 ri->merge_renames = NULL;
2852 if (!merge_detect_rename(opt))
2855 head_pairs = get_diffpairs(opt, common, head);
2856 merge_pairs = get_diffpairs(opt, common, merge);
2858 if (opt->detect_directory_renames) {
2859 dir_re_head = get_directory_renames(head_pairs);
2860 dir_re_merge = get_directory_renames(merge_pairs);
2862 handle_directory_level_conflicts(opt,
2864 dir_re_merge, merge);
2866 dir_re_head = xmalloc(sizeof(*dir_re_head));
2867 dir_re_merge = xmalloc(sizeof(*dir_re_merge));
2868 dir_rename_init(dir_re_head);
2869 dir_rename_init(dir_re_merge);
2872 ri->head_renames = get_renames(opt, opt->branch1, head_pairs,
2873 dir_re_merge, dir_re_head, head,
2874 common, head, merge, entries,
2878 ri->merge_renames = get_renames(opt, opt->branch2, merge_pairs,
2879 dir_re_head, dir_re_merge, merge,
2880 common, head, merge, entries,
2884 clean &= process_renames(opt, ri->head_renames, ri->merge_renames);
2888 * Some cleanup is deferred until cleanup_renames() because the
2889 * data structures are still needed and referenced in
2890 * process_entry(). But there are a few things we can free now.
2892 initial_cleanup_rename(head_pairs, dir_re_head);
2893 initial_cleanup_rename(merge_pairs, dir_re_merge);
2898 static void final_cleanup_rename(struct string_list *rename)
2900 const struct rename *re;
2906 for (i = 0; i < rename->nr; i++) {
2907 re = rename->items[i].util;
2908 diff_free_filepair(re->pair);
2910 string_list_clear(rename, 1);
2914 static void final_cleanup_renames(struct rename_info *re_info)
2916 final_cleanup_rename(re_info->head_renames);
2917 final_cleanup_rename(re_info->merge_renames);
2920 static int read_oid_strbuf(struct merge_options *opt,
2921 const struct object_id *oid,
2925 enum object_type type;
2927 buf = read_object_file(oid, &type, &size);
2929 return err(opt, _("cannot read object %s"), oid_to_hex(oid));
2930 if (type != OBJ_BLOB) {
2932 return err(opt, _("object %s is not a blob"), oid_to_hex(oid));
2934 strbuf_attach(dst, buf, size, size + 1);
2938 static int blob_unchanged(struct merge_options *opt,
2939 const struct diff_filespec *o,
2940 const struct diff_filespec *a,
2941 int renormalize, const char *path)
2943 struct strbuf obuf = STRBUF_INIT;
2944 struct strbuf abuf = STRBUF_INIT;
2945 int ret = 0; /* assume changed for safety */
2946 const struct index_state *idx = opt->repo->index;
2948 if (a->mode != o->mode)
2950 if (oid_eq(&o->oid, &a->oid))
2955 if (read_oid_strbuf(opt, &o->oid, &obuf) ||
2956 read_oid_strbuf(opt, &a->oid, &abuf))
2959 * Note: binary | is used so that both renormalizations are
2960 * performed. Comparison can be skipped if both files are
2961 * unchanged since their sha1s have already been compared.
2963 if (renormalize_buffer(idx, path, obuf.buf, obuf.len, &obuf) |
2964 renormalize_buffer(idx, path, abuf.buf, abuf.len, &abuf))
2965 ret = (obuf.len == abuf.len && !memcmp(obuf.buf, abuf.buf, obuf.len));
2968 strbuf_release(&obuf);
2969 strbuf_release(&abuf);
2973 static int handle_modify_delete(struct merge_options *opt,
2975 const struct diff_filespec *o,
2976 const struct diff_filespec *a,
2977 const struct diff_filespec *b)
2979 const char *modify_branch, *delete_branch;
2980 const struct diff_filespec *changed;
2983 modify_branch = opt->branch1;
2984 delete_branch = opt->branch2;
2987 modify_branch = opt->branch2;
2988 delete_branch = opt->branch1;
2992 return handle_change_delete(opt,
2995 modify_branch, delete_branch,
2996 _("modify"), _("modified"));
2999 static int handle_content_merge(struct merge_file_info *mfi,
3000 struct merge_options *opt,
3003 const struct diff_filespec *o,
3004 const struct diff_filespec *a,
3005 const struct diff_filespec *b,
3006 struct rename_conflict_info *ci)
3008 const char *reason = _("content");
3009 unsigned df_conflict_remains = 0;
3012 reason = _("add/add");
3014 assert(o->path && a->path && b->path);
3015 if (ci && dir_in_way(opt->repo->index, path, !opt->call_depth,
3016 S_ISGITLINK(ci->ren1->pair->two->mode)))
3017 df_conflict_remains = 1;
3019 if (merge_mode_and_contents(opt, o, a, b, path,
3020 opt->branch1, opt->branch2,
3021 opt->call_depth * 2, mfi))
3025 * We can skip updating the working tree file iff:
3026 * a) The merge is clean
3027 * b) The merge matches what was in HEAD (content, mode, pathname)
3028 * c) The target path is usable (i.e. not involved in D/F conflict)
3030 if (mfi->clean && was_tracked_and_matches(opt, path, &mfi->blob) &&
3031 !df_conflict_remains) {
3033 struct cache_entry *ce;
3035 output(opt, 3, _("Skipped %s (merged same as existing)"), path);
3036 if (add_cacheinfo(opt, &mfi->blob, path,
3037 0, (!opt->call_depth && !is_dirty), 0))
3040 * However, add_cacheinfo() will delete the old cache entry
3041 * and add a new one. We need to copy over any skip_worktree
3042 * flag to avoid making the file appear as if it were
3043 * deleted by the user.
3045 pos = index_name_pos(&opt->orig_index, path, strlen(path));
3046 ce = opt->orig_index.cache[pos];
3047 if (ce_skip_worktree(ce)) {
3048 pos = index_name_pos(opt->repo->index, path, strlen(path));
3049 ce = opt->repo->index->cache[pos];
3050 ce->ce_flags |= CE_SKIP_WORKTREE;
3056 if (S_ISGITLINK(mfi->blob.mode))
3057 reason = _("submodule");
3058 output(opt, 1, _("CONFLICT (%s): Merge conflict in %s"),
3060 if (ci && !df_conflict_remains)
3061 if (update_stages(opt, path, o, a, b))
3065 if (df_conflict_remains || is_dirty) {
3067 if (opt->call_depth) {
3068 remove_file_from_index(opt->repo->index, path);
3071 if (update_stages(opt, path, o, a, b))
3074 int file_from_stage2 = was_tracked(opt, path);
3076 if (update_stages(opt, path, NULL,
3077 file_from_stage2 ? &mfi->blob : NULL,
3078 file_from_stage2 ? NULL : &mfi->blob))
3083 new_path = unique_path(opt, path, ci->ren1->branch);
3085 output(opt, 1, _("Refusing to lose dirty file at %s"),
3088 output(opt, 1, _("Adding as %s instead"), new_path);
3089 if (update_file(opt, 0, &mfi->blob, new_path)) {
3095 } else if (update_file(opt, mfi->clean, &mfi->blob, path))
3097 return !is_dirty && mfi->clean;
3100 static int handle_rename_normal(struct merge_options *opt,
3102 const struct diff_filespec *o,
3103 const struct diff_filespec *a,
3104 const struct diff_filespec *b,
3105 struct rename_conflict_info *ci)
3107 struct rename *ren = ci->ren1;
3108 struct merge_file_info mfi;
3110 int side = (ren->branch == opt->branch1 ? 2 : 3);
3112 /* Merge the content and write it out */
3113 clean = handle_content_merge(&mfi, opt, path, was_dirty(opt, path),
3116 if (clean && opt->detect_directory_renames == 1 &&
3117 ren->dir_rename_original_dest) {
3118 if (update_stages(opt, path,
3120 side == 2 ? &mfi.blob : NULL,
3121 side == 2 ? NULL : &mfi.blob))
3123 clean = 0; /* not clean, but conflicted */
3128 static void dir_rename_warning(const char *msg,
3131 struct merge_options *opt,
3134 const char *other_branch;
3135 other_branch = (ren->branch == opt->branch1 ?
3136 opt->branch2 : opt->branch1);
3138 output(opt, clean ? 2 : 1, msg,
3139 ren->pair->one->path, ren->branch,
3140 other_branch, ren->pair->two->path);
3143 output(opt, clean ? 2 : 1, msg,
3144 ren->pair->one->path, ren->dir_rename_original_dest, ren->branch,
3145 other_branch, ren->pair->two->path);
3147 static int warn_about_dir_renamed_entries(struct merge_options *opt,
3151 int clean = 1, is_add;
3156 /* Return early if ren was not affected/created by a directory rename */
3157 if (!ren->dir_rename_original_dest)
3161 assert(opt->detect_directory_renames > 0);
3162 assert(ren->dir_rename_original_type == 'A' ||
3163 ren->dir_rename_original_type == 'R');
3165 /* Check whether to treat directory renames as a conflict */
3166 clean = (opt->detect_directory_renames == 2);
3168 is_add = (ren->dir_rename_original_type == 'A');
3169 if (ren->dir_rename_original_type == 'A' && clean) {
3170 msg = _("Path updated: %s added in %s inside a "
3171 "directory that was renamed in %s; moving it to %s.");
3172 } else if (ren->dir_rename_original_type == 'A' && !clean) {
3173 msg = _("CONFLICT (file location): %s added in %s "
3174 "inside a directory that was renamed in %s, "
3175 "suggesting it should perhaps be moved to %s.");
3176 } else if (ren->dir_rename_original_type == 'R' && clean) {
3177 msg = _("Path updated: %s renamed to %s in %s, inside a "
3178 "directory that was renamed in %s; moving it to %s.");
3179 } else if (ren->dir_rename_original_type == 'R' && !clean) {
3180 msg = _("CONFLICT (file location): %s renamed to %s in %s, "
3181 "inside a directory that was renamed in %s, "
3182 "suggesting it should perhaps be moved to %s.");
3184 BUG("Impossible dir_rename_original_type/clean combination");
3186 dir_rename_warning(msg, is_add, clean, opt, ren);
3191 /* Per entry merge function */
3192 static int process_entry(struct merge_options *opt,
3193 const char *path, struct stage_data *entry)
3195 int clean_merge = 1;
3196 int normalize = opt->renormalize;
3198 struct diff_filespec *o = &entry->stages[1];
3199 struct diff_filespec *a = &entry->stages[2];
3200 struct diff_filespec *b = &entry->stages[3];
3201 int o_valid = is_valid(o);
3202 int a_valid = is_valid(a);
3203 int b_valid = is_valid(b);
3204 o->path = a->path = b->path = (char*)path;
3206 entry->processed = 1;
3207 if (entry->rename_conflict_info) {
3208 struct rename_conflict_info *ci = entry->rename_conflict_info;
3209 struct diff_filespec *temp;
3212 path_clean = warn_about_dir_renamed_entries(opt, ci->ren1);
3213 path_clean &= warn_about_dir_renamed_entries(opt, ci->ren2);
3216 * For cases with a single rename, {o,a,b}->path have all been
3217 * set to the rename target path; we need to set two of these
3218 * back to the rename source.
3219 * For rename/rename conflicts, we'll manually fix paths below.
3221 temp = (opt->branch1 == ci->ren1->branch) ? b : a;
3222 o->path = temp->path = ci->ren1->pair->one->path;
3224 assert(opt->branch1 == ci->ren1->branch);
3227 switch (ci->rename_type) {
3229 case RENAME_ONE_FILE_TO_ONE:
3230 clean_merge = handle_rename_normal(opt, path, o, a, b,
3233 case RENAME_VIA_DIR:
3234 clean_merge = handle_rename_via_dir(opt, ci);
3238 * Probably unclean merge, but if the renamed file
3239 * merges cleanly and the result can then be
3240 * two-way merged cleanly with the added file, I
3241 * guess it's a clean merge?
3243 clean_merge = handle_rename_add(opt, ci);
3247 if (handle_rename_delete(opt, ci))
3250 case RENAME_ONE_FILE_TO_TWO:
3252 * Manually fix up paths; note:
3253 * ren[12]->pair->one->path are equal.
3255 o->path = ci->ren1->pair->one->path;
3256 a->path = ci->ren1->pair->two->path;
3257 b->path = ci->ren2->pair->two->path;
3260 if (handle_rename_rename_1to2(opt, ci))
3263 case RENAME_TWO_FILES_TO_ONE:
3265 * Manually fix up paths; note,
3266 * ren[12]->pair->two->path are actually equal.
3269 a->path = ci->ren1->pair->two->path;
3270 b->path = ci->ren2->pair->two->path;
3273 * Probably unclean merge, but if the two renamed
3274 * files merge cleanly and the two resulting files
3275 * can then be two-way merged cleanly, I guess it's
3278 clean_merge = handle_rename_rename_2to1(opt, ci);
3281 entry->processed = 0;
3284 if (path_clean < clean_merge)
3285 clean_merge = path_clean;
3286 } else if (o_valid && (!a_valid || !b_valid)) {
3287 /* Case A: Deleted in one */
3288 if ((!a_valid && !b_valid) ||
3289 (!b_valid && blob_unchanged(opt, o, a, normalize, path)) ||
3290 (!a_valid && blob_unchanged(opt, o, b, normalize, path))) {
3291 /* Deleted in both or deleted in one and
3292 * unchanged in the other */
3294 output(opt, 2, _("Removing %s"), path);
3295 /* do not touch working file if it did not exist */
3296 remove_file(opt, 1, path, !a_valid);
3298 /* Modify/delete; deleted side may have put a directory in the way */
3300 if (handle_modify_delete(opt, path, o, a, b))
3303 } else if ((!o_valid && a_valid && !b_valid) ||
3304 (!o_valid && !a_valid && b_valid)) {
3305 /* Case B: Added in one. */
3306 /* [nothing|directory] -> ([nothing|directory], file) */
3308 const char *add_branch;
3309 const char *other_branch;
3311 const struct diff_filespec *contents;
3314 add_branch = opt->branch1;
3315 other_branch = opt->branch2;
3317 conf = _("file/directory");
3319 add_branch = opt->branch2;
3320 other_branch = opt->branch1;
3322 conf = _("directory/file");
3324 if (dir_in_way(opt->repo->index, path,
3325 !opt->call_depth && !S_ISGITLINK(a->mode),
3327 char *new_path = unique_path(opt, path, add_branch);
3329 output(opt, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3331 conf, path, other_branch, path, new_path);
3332 if (update_file(opt, 0, contents, new_path))
3334 else if (opt->call_depth)
3335 remove_file_from_index(opt->repo->index, path);
3338 output(opt, 2, _("Adding %s"), path);
3339 /* do not overwrite file if already present */
3340 if (update_file_flags(opt, contents, path, 1, !a_valid))
3343 } else if (a_valid && b_valid) {
3345 /* Case C: Added in both (check for same permissions) */
3347 _("CONFLICT (add/add): Merge conflict in %s"),
3349 clean_merge = handle_file_collision(opt,
3355 /* case D: Modified in both, but differently. */
3356 struct merge_file_info mfi;
3357 int is_dirty = 0; /* unpack_trees would have bailed if dirty */
3358 clean_merge = handle_content_merge(&mfi, opt, path,
3362 } else if (!o_valid && !a_valid && !b_valid) {
3364 * this entry was deleted altogether. a_mode == 0 means
3365 * we had that path and want to actively remove it.
3367 remove_file(opt, 1, path, !a->mode);
3369 BUG("fatal merge failure, shouldn't happen.");
3374 int merge_trees(struct merge_options *opt,
3377 struct tree *common,
3378 struct tree **result)
3380 struct index_state *istate = opt->repo->index;
3382 struct strbuf sb = STRBUF_INIT;
3384 if (!opt->call_depth && repo_index_has_changes(opt->repo, head, &sb)) {
3385 err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3390 if (opt->subtree_shift) {
3391 merge = shift_tree_object(opt->repo, head, merge, opt->subtree_shift);
3392 common = shift_tree_object(opt->repo, head, common, opt->subtree_shift);
3395 if (oid_eq(&common->object.oid, &merge->object.oid)) {
3396 output(opt, 0, _("Already up to date!"));
3401 code = unpack_trees_start(opt, common, head, merge);
3404 if (show(opt, 4) || opt->call_depth)
3405 err(opt, _("merging of trees %s and %s failed"),
3406 oid_to_hex(&head->object.oid),
3407 oid_to_hex(&merge->object.oid));
3408 unpack_trees_finish(opt);
3412 if (unmerged_index(istate)) {
3413 struct string_list *entries;
3414 struct rename_info re_info;
3417 * Only need the hashmap while processing entries, so
3418 * initialize it here and free it when we are done running
3419 * through the entries. Keeping it in the merge_options as
3420 * opposed to decaring a local hashmap is for convenience
3421 * so that we don't have to pass it to around.
3423 hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp, NULL, 512);
3424 get_files_dirs(opt, head);
3425 get_files_dirs(opt, merge);
3427 entries = get_unmerged(opt->repo->index);
3428 clean = detect_and_process_renames(opt, common, head, merge,
3430 record_df_conflict_files(opt, entries);
3433 for (i = entries->nr-1; 0 <= i; i--) {
3434 const char *path = entries->items[i].string;
3435 struct stage_data *e = entries->items[i].util;
3436 if (!e->processed) {
3437 int ret = process_entry(opt, path, e);
3446 for (i = 0; i < entries->nr; i++) {
3447 struct stage_data *e = entries->items[i].util;
3449 BUG("unprocessed path??? %s",
3450 entries->items[i].string);
3454 final_cleanup_renames(&re_info);
3456 string_list_clear(entries, 1);
3459 hashmap_free(&opt->current_file_dir_set, 1);
3462 unpack_trees_finish(opt);
3469 unpack_trees_finish(opt);
3471 if (opt->call_depth && !(*result = write_tree_from_memory(opt)))
3477 static struct commit_list *reverse_commit_list(struct commit_list *list)
3479 struct commit_list *next = NULL, *current, *backup;
3480 for (current = list; current; current = backup) {
3481 backup = current->next;
3482 current->next = next;
3489 * Merge the commits h1 and h2, return the resulting virtual
3490 * commit object and a flag indicating the cleanness of the merge.
3492 int merge_recursive(struct merge_options *opt,
3495 struct commit_list *ca,
3496 struct commit **result)
3498 struct commit_list *iter;
3499 struct commit *merged_common_ancestors;
3500 struct tree *mrtree;
3504 output(opt, 4, _("Merging:"));
3505 output_commit_title(opt, h1);
3506 output_commit_title(opt, h2);
3510 ca = get_merge_bases(h1, h2);
3511 ca = reverse_commit_list(ca);
3515 unsigned cnt = commit_list_count(ca);
3517 output(opt, 5, Q_("found %u common ancestor:",
3518 "found %u common ancestors:", cnt), cnt);
3519 for (iter = ca; iter; iter = iter->next)
3520 output_commit_title(opt, iter->item);
3523 merged_common_ancestors = pop_commit(&ca);
3524 if (merged_common_ancestors == NULL) {
3525 /* if there is no common ancestor, use an empty tree */
3528 tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree);
3529 merged_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor");
3532 for (iter = ca; iter; iter = iter->next) {
3533 const char *saved_b1, *saved_b2;
3536 * When the merge fails, the result contains files
3537 * with conflict markers. The cleanness flag is
3538 * ignored (unless indicating an error), it was never
3539 * actually used, as result of merge_trees has always
3540 * overwritten it: the committed "conflicts" were
3543 discard_index(opt->repo->index);
3544 saved_b1 = opt->branch1;
3545 saved_b2 = opt->branch2;
3546 opt->branch1 = "Temporary merge branch 1";
3547 opt->branch2 = "Temporary merge branch 2";
3548 if (merge_recursive(opt, merged_common_ancestors, iter->item,
3549 NULL, &merged_common_ancestors) < 0)
3551 opt->branch1 = saved_b1;
3552 opt->branch2 = saved_b2;
3555 if (!merged_common_ancestors)
3556 return err(opt, _("merge returned no commit"));
3559 discard_index(opt->repo->index);
3560 if (!opt->call_depth)
3561 repo_read_index(opt->repo);
3563 opt->ancestor = "merged common ancestors";
3564 clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2),
3565 get_commit_tree(merged_common_ancestors),
3572 if (opt->call_depth) {
3573 *result = make_virtual_commit(opt->repo, mrtree, "merged tree");
3574 commit_list_insert(h1, &(*result)->parents);
3575 commit_list_insert(h2, &(*result)->parents->next);
3578 if (!opt->call_depth && opt->buffer_output < 2)
3579 strbuf_release(&opt->obuf);
3581 diff_warn_rename_limit("merge.renamelimit",
3582 opt->needed_rename_limit, 0);
3586 static struct commit *get_ref(struct repository *repo, const struct object_id *oid,
3589 struct object *object;
3591 object = deref_tag(repo, parse_object(repo, oid),
3592 name, strlen(name));
3595 if (object->type == OBJ_TREE)
3596 return make_virtual_commit(repo, (struct tree*)object, name);
3597 if (object->type != OBJ_COMMIT)
3599 if (parse_commit((struct commit *)object))
3601 return (struct commit *)object;
3604 int merge_recursive_generic(struct merge_options *opt,
3605 const struct object_id *head,
3606 const struct object_id *merge,
3608 const struct object_id **base_list,
3609 struct commit **result)
3612 struct lock_file lock = LOCK_INIT;
3613 struct commit *head_commit = get_ref(opt->repo, head, opt->branch1);
3614 struct commit *next_commit = get_ref(opt->repo, merge, opt->branch2);
3615 struct commit_list *ca = NULL;
3619 for (i = 0; i < num_base_list; ++i) {
3620 struct commit *base;
3621 if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i]))))
3622 return err(opt, _("Could not parse object '%s'"),
3623 oid_to_hex(base_list[i]));
3624 commit_list_insert(base, &ca);
3628 repo_hold_locked_index(opt->repo, &lock, LOCK_DIE_ON_ERROR);
3629 clean = merge_recursive(opt, head_commit, next_commit, ca,
3632 rollback_lock_file(&lock);
3636 if (write_locked_index(opt->repo->index, &lock,
3637 COMMIT_LOCK | SKIP_IF_UNCHANGED))
3638 return err(opt, _("Unable to write index."));
3640 return clean ? 0 : 1;
3643 static void merge_recursive_config(struct merge_options *opt)
3646 git_config_get_int("merge.verbosity", &opt->verbosity);
3647 git_config_get_int("diff.renamelimit", &opt->diff_rename_limit);
3648 git_config_get_int("merge.renamelimit", &opt->merge_rename_limit);
3649 if (!git_config_get_string("diff.renames", &value)) {
3650 opt->diff_detect_rename = git_config_rename("diff.renames", value);
3653 if (!git_config_get_string("merge.renames", &value)) {
3654 opt->merge_detect_rename = git_config_rename("merge.renames", value);
3657 if (!git_config_get_string("merge.directoryrenames", &value)) {
3658 int boolval = git_parse_maybe_bool(value);
3660 opt->detect_directory_renames = boolval ? 2 : 0;
3661 } else if (!strcasecmp(value, "conflict")) {
3662 opt->detect_directory_renames = 1;
3663 } /* avoid erroring on values from future versions of git */
3666 git_config(git_xmerge_config, NULL);
3669 void init_merge_options(struct merge_options *opt,
3670 struct repository *repo)
3672 const char *merge_verbosity;
3673 memset(opt, 0, sizeof(struct merge_options));
3676 opt->buffer_output = 1;
3677 opt->diff_rename_limit = -1;
3678 opt->merge_rename_limit = -1;
3679 opt->renormalize = 0;
3680 opt->diff_detect_rename = -1;
3681 opt->merge_detect_rename = -1;
3682 opt->detect_directory_renames = 1;
3683 merge_recursive_config(opt);
3684 merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
3685 if (merge_verbosity)
3686 opt->verbosity = strtol(merge_verbosity, NULL, 10);
3687 if (opt->verbosity >= 5)
3688 opt->buffer_output = 0;
3689 strbuf_init(&opt->obuf, 0);
3690 string_list_init(&opt->df_conflict_file_set, 1);
3693 int parse_merge_opt(struct merge_options *opt, const char *s)
3699 if (!strcmp(s, "ours"))
3700 opt->recursive_variant = MERGE_RECURSIVE_OURS;
3701 else if (!strcmp(s, "theirs"))
3702 opt->recursive_variant = MERGE_RECURSIVE_THEIRS;
3703 else if (!strcmp(s, "subtree"))
3704 opt->subtree_shift = "";
3705 else if (skip_prefix(s, "subtree=", &arg))
3706 opt->subtree_shift = arg;
3707 else if (!strcmp(s, "patience"))
3708 opt->xdl_opts = DIFF_WITH_ALG(opt, PATIENCE_DIFF);
3709 else if (!strcmp(s, "histogram"))
3710 opt->xdl_opts = DIFF_WITH_ALG(opt, HISTOGRAM_DIFF);
3711 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
3712 long value = parse_algorithm_value(arg);
3715 /* clear out previous settings */
3716 DIFF_XDL_CLR(opt, NEED_MINIMAL);
3717 opt->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3718 opt->xdl_opts |= value;
3720 else if (!strcmp(s, "ignore-space-change"))
3721 DIFF_XDL_SET(opt, IGNORE_WHITESPACE_CHANGE);
3722 else if (!strcmp(s, "ignore-all-space"))
3723 DIFF_XDL_SET(opt, IGNORE_WHITESPACE);
3724 else if (!strcmp(s, "ignore-space-at-eol"))
3725 DIFF_XDL_SET(opt, IGNORE_WHITESPACE_AT_EOL);
3726 else if (!strcmp(s, "ignore-cr-at-eol"))
3727 DIFF_XDL_SET(opt, IGNORE_CR_AT_EOL);
3728 else if (!strcmp(s, "renormalize"))
3729 opt->renormalize = 1;
3730 else if (!strcmp(s, "no-renormalize"))
3731 opt->renormalize = 0;
3732 else if (!strcmp(s, "no-renames"))
3733 opt->merge_detect_rename = 0;
3734 else if (!strcmp(s, "find-renames")) {
3735 opt->merge_detect_rename = 1;
3736 opt->rename_score = 0;
3738 else if (skip_prefix(s, "find-renames=", &arg) ||
3739 skip_prefix(s, "rename-threshold=", &arg)) {
3740 if ((opt->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
3742 opt->merge_detect_rename = 1;
3745 * Please update $__git_merge_strategy_options in
3746 * git-completion.bash when you add new options