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"
14 #include "tree-walk.h"
18 #include "unpack-trees.h"
19 #include "string-list.h"
20 #include "xdiff-interface.h"
23 #include "merge-recursive.h"
25 #include "submodule.h"
27 struct path_hashmap_entry {
28 struct hashmap_entry e;
29 char path[FLEX_ARRAY];
32 static int path_hashmap_cmp(const void *cmp_data,
34 const void *entry_or_key,
37 const struct path_hashmap_entry *a = entry;
38 const struct path_hashmap_entry *b = entry_or_key;
39 const char *key = keydata;
42 return strcasecmp(a->path, key ? key : b->path);
44 return strcmp(a->path, key ? key : b->path);
47 static unsigned int path_hash(const char *path)
49 return ignore_case ? strihash(path) : strhash(path);
52 static void flush_output(struct merge_options *o)
54 if (o->buffer_output < 2 && o->obuf.len) {
55 fputs(o->obuf.buf, stdout);
56 strbuf_reset(&o->obuf);
60 static int err(struct merge_options *o, const char *err, ...)
64 if (o->buffer_output < 2)
67 strbuf_complete(&o->obuf, '\n');
68 strbuf_addstr(&o->obuf, "error: ");
70 va_start(params, err);
71 strbuf_vaddf(&o->obuf, err, params);
73 if (o->buffer_output > 1)
74 strbuf_addch(&o->obuf, '\n');
76 error("%s", o->obuf.buf);
77 strbuf_reset(&o->obuf);
83 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
84 const char *subtree_shift)
86 struct object_id shifted;
88 if (!*subtree_shift) {
89 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
91 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
94 if (!oidcmp(&two->object.oid, &shifted))
96 return lookup_tree(&shifted);
99 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
101 struct commit *commit = alloc_commit_node();
103 set_merge_remote_desc(commit, comment, (struct object *)commit);
105 commit->object.parsed = 1;
110 * Since we use get_tree_entry(), which does not put the read object into
111 * the object pool, we cannot rely on a == b.
113 static int oid_eq(const struct object_id *a, const struct object_id *b)
117 return a && b && oidcmp(a, b) == 0;
123 RENAME_ONE_FILE_TO_ONE,
124 RENAME_ONE_FILE_TO_TWO,
125 RENAME_TWO_FILES_TO_ONE
128 struct rename_conflict_info {
129 enum rename_type rename_type;
130 struct diff_filepair *pair1;
131 struct diff_filepair *pair2;
134 struct stage_data *dst_entry1;
135 struct stage_data *dst_entry2;
136 struct diff_filespec ren1_other;
137 struct diff_filespec ren2_other;
141 * Since we want to write the index eventually, we cannot reuse the index
142 * for these (temporary) data.
147 struct object_id oid;
149 struct rename_conflict_info *rename_conflict_info;
150 unsigned processed:1;
153 static inline void setup_rename_conflict_info(enum rename_type rename_type,
154 struct diff_filepair *pair1,
155 struct diff_filepair *pair2,
158 struct stage_data *dst_entry1,
159 struct stage_data *dst_entry2,
160 struct merge_options *o,
161 struct stage_data *src_entry1,
162 struct stage_data *src_entry2)
164 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
165 ci->rename_type = rename_type;
167 ci->branch1 = branch1;
168 ci->branch2 = branch2;
170 ci->dst_entry1 = dst_entry1;
171 dst_entry1->rename_conflict_info = ci;
172 dst_entry1->processed = 0;
174 assert(!pair2 == !dst_entry2);
176 ci->dst_entry2 = dst_entry2;
178 dst_entry2->rename_conflict_info = ci;
181 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
183 * For each rename, there could have been
184 * modifications on the side of history where that
185 * file was not renamed.
187 int ostage1 = o->branch1 == branch1 ? 3 : 2;
188 int ostage2 = ostage1 ^ 1;
190 ci->ren1_other.path = pair1->one->path;
191 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
192 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
194 ci->ren2_other.path = pair2->one->path;
195 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
196 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
200 static int show(struct merge_options *o, int v)
202 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
205 __attribute__((format (printf, 3, 4)))
206 static void output(struct merge_options *o, int v, const char *fmt, ...)
213 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
216 strbuf_vaddf(&o->obuf, fmt, ap);
219 strbuf_addch(&o->obuf, '\n');
220 if (!o->buffer_output)
224 static void output_commit_title(struct merge_options *o, struct commit *commit)
226 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
228 strbuf_addf(&o->obuf, "virtual %s\n",
229 merge_remote_util(commit)->name);
231 strbuf_add_unique_abbrev(&o->obuf, commit->object.oid.hash,
233 strbuf_addch(&o->obuf, ' ');
234 if (parse_commit(commit) != 0)
235 strbuf_addstr(&o->obuf, _("(bad commit)\n"));
238 const char *msg = get_commit_buffer(commit, NULL);
239 int len = find_commit_subject(msg, &title);
241 strbuf_addf(&o->obuf, "%.*s\n", len, title);
242 unuse_commit_buffer(commit, msg);
248 static int add_cacheinfo(struct merge_options *o,
249 unsigned int mode, const struct object_id *oid,
250 const char *path, int stage, int refresh, int options)
252 struct cache_entry *ce;
255 ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0);
257 return err(o, _("addinfo_cache failed for path '%s'"), path);
259 ret = add_cache_entry(ce, options);
261 struct cache_entry *nce;
263 nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
265 return err(o, _("addinfo_cache failed for path '%s'"), path);
267 ret = add_cache_entry(nce, options);
272 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
275 init_tree_desc(desc, tree->buffer, tree->size);
278 static int git_merge_trees(int index_only,
284 struct tree_desc t[3];
285 struct unpack_trees_options opts;
287 memset(&opts, 0, sizeof(opts));
294 opts.fn = threeway_merge;
295 opts.src_index = &the_index;
296 opts.dst_index = &the_index;
297 setup_unpack_trees_porcelain(&opts, "merge");
299 init_tree_desc_from_tree(t+0, common);
300 init_tree_desc_from_tree(t+1, head);
301 init_tree_desc_from_tree(t+2, merge);
303 rc = unpack_trees(3, t, &opts);
304 cache_tree_free(&active_cache_tree);
308 struct tree *write_tree_from_memory(struct merge_options *o)
310 struct tree *result = NULL;
312 if (unmerged_cache()) {
314 fprintf(stderr, "BUG: There are unmerged index entries:\n");
315 for (i = 0; i < active_nr; i++) {
316 const struct cache_entry *ce = active_cache[i];
318 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
319 (int)ce_namelen(ce), ce->name);
321 die("BUG: unmerged index entries in merge-recursive.c");
324 if (!active_cache_tree)
325 active_cache_tree = cache_tree();
327 if (!cache_tree_fully_valid(active_cache_tree) &&
328 cache_tree_update(&the_index, 0) < 0) {
329 err(o, _("error building trees"));
333 result = lookup_tree(&active_cache_tree->oid);
338 static int save_files_dirs(const unsigned char *sha1,
339 struct strbuf *base, const char *path,
340 unsigned int mode, int stage, void *context)
342 struct path_hashmap_entry *entry;
343 int baselen = base->len;
344 struct merge_options *o = context;
346 strbuf_addstr(base, path);
348 FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
349 hashmap_entry_init(entry, path_hash(entry->path));
350 hashmap_add(&o->current_file_dir_set, entry);
352 strbuf_setlen(base, baselen);
353 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
356 static void get_files_dirs(struct merge_options *o, struct tree *tree)
358 struct pathspec match_all;
359 memset(&match_all, 0, sizeof(match_all));
360 read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
364 * Returns an index_entry instance which doesn't have to correspond to
365 * a real cache entry in Git's index.
367 static struct stage_data *insert_stage_data(const char *path,
368 struct tree *o, struct tree *a, struct tree *b,
369 struct string_list *entries)
371 struct string_list_item *item;
372 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
373 get_tree_entry(o->object.oid.hash, path,
374 e->stages[1].oid.hash, &e->stages[1].mode);
375 get_tree_entry(a->object.oid.hash, path,
376 e->stages[2].oid.hash, &e->stages[2].mode);
377 get_tree_entry(b->object.oid.hash, path,
378 e->stages[3].oid.hash, &e->stages[3].mode);
379 item = string_list_insert(entries, path);
385 * Create a dictionary mapping file names to stage_data objects. The
386 * dictionary contains one entry for every path with a non-zero stage entry.
388 static struct string_list *get_unmerged(void)
390 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
393 unmerged->strdup_strings = 1;
395 for (i = 0; i < active_nr; i++) {
396 struct string_list_item *item;
397 struct stage_data *e;
398 const struct cache_entry *ce = active_cache[i];
402 item = string_list_lookup(unmerged, ce->name);
404 item = string_list_insert(unmerged, ce->name);
405 item->util = xcalloc(1, sizeof(struct stage_data));
408 e->stages[ce_stage(ce)].mode = ce->ce_mode;
409 oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
415 static int string_list_df_name_compare(const char *one, const char *two)
417 int onelen = strlen(one);
418 int twolen = strlen(two);
420 * Here we only care that entries for D/F conflicts are
421 * adjacent, in particular with the file of the D/F conflict
422 * appearing before files below the corresponding directory.
423 * The order of the rest of the list is irrelevant for us.
425 * To achieve this, we sort with df_name_compare and provide
426 * the mode S_IFDIR so that D/F conflicts will sort correctly.
427 * We use the mode S_IFDIR for everything else for simplicity,
428 * since in other cases any changes in their order due to
429 * sorting cause no problems for us.
431 int cmp = df_name_compare(one, onelen, S_IFDIR,
432 two, twolen, S_IFDIR);
434 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
435 * that 'foo' comes before 'foo/bar'.
439 return onelen - twolen;
442 static void record_df_conflict_files(struct merge_options *o,
443 struct string_list *entries)
445 /* If there is a D/F conflict and the file for such a conflict
446 * currently exist in the working tree, we want to allow it to be
447 * removed to make room for the corresponding directory if needed.
448 * The files underneath the directories of such D/F conflicts will
449 * be processed before the corresponding file involved in the D/F
450 * conflict. If the D/F directory ends up being removed by the
451 * merge, then we won't have to touch the D/F file. If the D/F
452 * directory needs to be written to the working copy, then the D/F
453 * file will simply be removed (in make_room_for_path()) to make
454 * room for the necessary paths. Note that if both the directory
455 * and the file need to be present, then the D/F file will be
456 * reinstated with a new unique name at the time it is processed.
458 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
459 const char *last_file = NULL;
464 * If we're merging merge-bases, we don't want to bother with
465 * any working directory changes.
470 /* Ensure D/F conflicts are adjacent in the entries list. */
471 for (i = 0; i < entries->nr; i++) {
472 struct string_list_item *next = &entries->items[i];
473 string_list_append(&df_sorted_entries, next->string)->util =
476 df_sorted_entries.cmp = string_list_df_name_compare;
477 string_list_sort(&df_sorted_entries);
479 string_list_clear(&o->df_conflict_file_set, 1);
480 for (i = 0; i < df_sorted_entries.nr; i++) {
481 const char *path = df_sorted_entries.items[i].string;
482 int len = strlen(path);
483 struct stage_data *e = df_sorted_entries.items[i].util;
486 * Check if last_file & path correspond to a D/F conflict;
487 * i.e. whether path is last_file+'/'+<something>.
488 * If so, record that it's okay to remove last_file to make
489 * room for path and friends if needed.
493 memcmp(path, last_file, last_len) == 0 &&
494 path[last_len] == '/') {
495 string_list_insert(&o->df_conflict_file_set, last_file);
499 * Determine whether path could exist as a file in the
500 * working directory as a possible D/F conflict. This
501 * will only occur when it exists in stage 2 as a
504 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
511 string_list_clear(&df_sorted_entries, 0);
515 struct diff_filepair *pair;
517 * Purpose of src_entry and dst_entry:
519 * If 'before' is renamed to 'after' then src_entry will contain
520 * the versions of 'before' from the merge_base, HEAD, and MERGE in
521 * stages 1, 2, and 3; dst_entry will contain the respective
522 * versions of 'after' in corresponding locations. Thus, we have a
523 * total of six modes and oids, though some will be null. (Stage 0
524 * is ignored; we're interested in handling conflicts.)
526 * Since we don't turn on break-rewrites by default, neither
527 * src_entry nor dst_entry can have all three of their stages have
528 * non-null oids, meaning at most four of the six will be non-null.
529 * Also, since this is a rename, both src_entry and dst_entry will
530 * have at least one non-null oid, meaning at least two will be
531 * non-null. Of the six oids, a typical rename will have three be
532 * non-null. Only two implies a rename/delete, and four implies a
535 struct stage_data *src_entry;
536 struct stage_data *dst_entry;
537 unsigned processed:1;
540 static int update_stages(struct merge_options *opt, const char *path,
541 const struct diff_filespec *o,
542 const struct diff_filespec *a,
543 const struct diff_filespec *b)
547 * NOTE: It is usually a bad idea to call update_stages on a path
548 * before calling update_file on that same path, since it can
549 * sometimes lead to spurious "refusing to lose untracked file..."
550 * messages from update_file (via make_room_for path via
551 * would_lose_untracked). Instead, reverse the order of the calls
552 * (executing update_file first and then update_stages).
555 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
557 if (remove_file_from_cache(path))
560 if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
563 if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
566 if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
571 static void update_entry(struct stage_data *entry,
572 struct diff_filespec *o,
573 struct diff_filespec *a,
574 struct diff_filespec *b)
576 entry->processed = 0;
577 entry->stages[1].mode = o->mode;
578 entry->stages[2].mode = a->mode;
579 entry->stages[3].mode = b->mode;
580 oidcpy(&entry->stages[1].oid, &o->oid);
581 oidcpy(&entry->stages[2].oid, &a->oid);
582 oidcpy(&entry->stages[3].oid, &b->oid);
585 static int remove_file(struct merge_options *o, int clean,
586 const char *path, int no_wd)
588 int update_cache = o->call_depth || clean;
589 int update_working_directory = !o->call_depth && !no_wd;
592 if (remove_file_from_cache(path))
595 if (update_working_directory) {
597 struct cache_entry *ce;
598 ce = cache_file_exists(path, strlen(path), ignore_case);
599 if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
602 if (remove_path(path))
608 /* add a string to a strbuf, but converting "/" to "_" */
609 static void add_flattened_path(struct strbuf *out, const char *s)
612 strbuf_addstr(out, s);
613 for (; i < out->len; i++)
614 if (out->buf[i] == '/')
618 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
620 struct path_hashmap_entry *entry;
621 struct strbuf newpath = STRBUF_INIT;
625 strbuf_addf(&newpath, "%s~", path);
626 add_flattened_path(&newpath, branch);
628 base_len = newpath.len;
629 while (hashmap_get_from_hash(&o->current_file_dir_set,
630 path_hash(newpath.buf), newpath.buf) ||
631 (!o->call_depth && file_exists(newpath.buf))) {
632 strbuf_setlen(&newpath, base_len);
633 strbuf_addf(&newpath, "_%d", suffix++);
636 FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
637 hashmap_entry_init(entry, path_hash(entry->path));
638 hashmap_add(&o->current_file_dir_set, entry);
639 return strbuf_detach(&newpath, NULL);
643 * Check whether a directory in the index is in the way of an incoming
644 * file. Return 1 if so. If check_working_copy is non-zero, also
645 * check the working directory. If empty_ok is non-zero, also return
646 * 0 in the case where the working-tree dir exists but is empty.
648 static int dir_in_way(const char *path, int check_working_copy, int empty_ok)
651 struct strbuf dirpath = STRBUF_INIT;
654 strbuf_addstr(&dirpath, path);
655 strbuf_addch(&dirpath, '/');
657 pos = cache_name_pos(dirpath.buf, dirpath.len);
661 if (pos < active_nr &&
662 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
663 strbuf_release(&dirpath);
667 strbuf_release(&dirpath);
668 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
669 !(empty_ok && is_empty_dir(path));
672 static int was_tracked(const char *path)
674 int pos = cache_name_pos(path, strlen(path));
677 /* we have been tracking this path */
681 * Look for an unmerged entry for the path,
682 * specifically stage #2, which would indicate
683 * that "our" side before the merge started
684 * had the path tracked (and resulted in a conflict).
687 pos < active_nr && !strcmp(path, active_cache[pos]->name);
689 if (ce_stage(active_cache[pos]) == 2)
694 static int would_lose_untracked(const char *path)
696 return !was_tracked(path) && file_exists(path);
699 static int make_room_for_path(struct merge_options *o, const char *path)
702 const char *msg = _("failed to create path '%s'%s");
704 /* Unlink any D/F conflict files that are in the way */
705 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
706 const char *df_path = o->df_conflict_file_set.items[i].string;
707 size_t pathlen = strlen(path);
708 size_t df_pathlen = strlen(df_path);
709 if (df_pathlen < pathlen &&
710 path[df_pathlen] == '/' &&
711 strncmp(path, df_path, df_pathlen) == 0) {
713 _("Removing %s to make room for subdirectory\n"),
716 unsorted_string_list_delete_item(&o->df_conflict_file_set,
722 /* Make sure leading directories are created */
723 status = safe_create_leading_directories_const(path);
725 if (status == SCLD_EXISTS)
726 /* something else exists */
727 return err(o, msg, path, _(": perhaps a D/F conflict?"));
728 return err(o, msg, path, "");
732 * Do not unlink a file in the work tree if we are not
735 if (would_lose_untracked(path))
736 return err(o, _("refusing to lose untracked file at '%s'"),
739 /* Successful unlink is good.. */
742 /* .. and so is no existing file */
745 /* .. but not some other error (who really cares what?) */
746 return err(o, msg, path, _(": perhaps a D/F conflict?"));
749 static int update_file_flags(struct merge_options *o,
750 const struct object_id *oid,
762 enum object_type type;
766 if (S_ISGITLINK(mode)) {
768 * We may later decide to recursively descend into
769 * the submodule directory and update its index
770 * and/or work tree, but we do not do that now.
776 buf = read_sha1_file(oid->hash, &type, &size);
778 return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
779 if (type != OBJ_BLOB) {
780 ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
784 struct strbuf strbuf = STRBUF_INIT;
785 if (convert_to_working_tree(path, buf, size, &strbuf)) {
788 buf = strbuf_detach(&strbuf, NULL);
792 if (make_room_for_path(o, path) < 0) {
796 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
802 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
804 ret = err(o, _("failed to open '%s': %s"),
805 path, strerror(errno));
808 write_in_full(fd, buf, size);
810 } else if (S_ISLNK(mode)) {
811 char *lnk = xmemdupz(buf, size);
812 safe_create_leading_directories_const(path);
814 if (symlink(lnk, path))
815 ret = err(o, _("failed to symlink '%s': %s"),
816 path, strerror(errno));
820 _("do not know what to do with %06o %s '%s'"),
821 mode, oid_to_hex(oid), path);
826 if (!ret && update_cache)
827 add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
831 static int update_file(struct merge_options *o,
833 const struct object_id *oid,
837 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
840 /* Low level file merging, update and removal */
842 struct merge_file_info {
843 struct object_id oid;
849 static int merge_3way(struct merge_options *o,
850 mmbuffer_t *result_buf,
851 const struct diff_filespec *one,
852 const struct diff_filespec *a,
853 const struct diff_filespec *b,
857 mmfile_t orig, src1, src2;
858 struct ll_merge_options ll_opts = {0};
859 char *base_name, *name1, *name2;
862 ll_opts.renormalize = o->renormalize;
863 ll_opts.xdl_opts = o->xdl_opts;
866 ll_opts.virtual_ancestor = 1;
869 switch (o->recursive_variant) {
870 case MERGE_RECURSIVE_OURS:
871 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
873 case MERGE_RECURSIVE_THEIRS:
874 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
882 if (strcmp(a->path, b->path) ||
883 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
884 base_name = o->ancestor == NULL ? NULL :
885 mkpathdup("%s:%s", o->ancestor, one->path);
886 name1 = mkpathdup("%s:%s", branch1, a->path);
887 name2 = mkpathdup("%s:%s", branch2, b->path);
889 base_name = o->ancestor == NULL ? NULL :
890 mkpathdup("%s", o->ancestor);
891 name1 = mkpathdup("%s", branch1);
892 name2 = mkpathdup("%s", branch2);
895 read_mmblob(&orig, &one->oid);
896 read_mmblob(&src1, &a->oid);
897 read_mmblob(&src2, &b->oid);
899 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
900 &src1, name1, &src2, name2, &ll_opts);
911 static int merge_file_1(struct merge_options *o,
912 const struct diff_filespec *one,
913 const struct diff_filespec *a,
914 const struct diff_filespec *b,
917 struct merge_file_info *result)
922 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
924 if (S_ISREG(a->mode)) {
925 result->mode = a->mode;
926 oidcpy(&result->oid, &a->oid);
928 result->mode = b->mode;
929 oidcpy(&result->oid, &b->oid);
932 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
938 if (a->mode == b->mode || a->mode == one->mode)
939 result->mode = b->mode;
941 result->mode = a->mode;
942 if (b->mode != one->mode) {
948 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
949 oidcpy(&result->oid, &b->oid);
950 else if (oid_eq(&b->oid, &one->oid))
951 oidcpy(&result->oid, &a->oid);
952 else if (S_ISREG(a->mode)) {
953 mmbuffer_t result_buf;
954 int ret = 0, merge_status;
956 merge_status = merge_3way(o, &result_buf, one, a, b,
959 if ((merge_status < 0) || !result_buf.ptr)
960 ret = err(o, _("Failed to execute internal merge"));
962 if (!ret && write_sha1_file(result_buf.ptr, result_buf.size,
963 blob_type, result->oid.hash))
964 ret = err(o, _("Unable to add %s to database"),
967 free(result_buf.ptr);
970 result->clean = (merge_status == 0);
971 } else if (S_ISGITLINK(a->mode)) {
972 result->clean = merge_submodule(&result->oid,
978 } else if (S_ISLNK(a->mode)) {
979 oidcpy(&result->oid, &a->oid);
981 if (!oid_eq(&a->oid, &b->oid))
984 die("BUG: unsupported object type in the tree");
990 static int merge_file_special_markers(struct merge_options *o,
991 const struct diff_filespec *one,
992 const struct diff_filespec *a,
993 const struct diff_filespec *b,
995 const char *filename1,
997 const char *filename2,
998 struct merge_file_info *mfi)
1005 side1 = xstrfmt("%s:%s", branch1, filename1);
1007 side2 = xstrfmt("%s:%s", branch2, filename2);
1009 ret = merge_file_1(o, one, a, b,
1010 side1 ? side1 : branch1,
1011 side2 ? side2 : branch2, mfi);
1017 static int merge_file_one(struct merge_options *o,
1019 const struct object_id *o_oid, int o_mode,
1020 const struct object_id *a_oid, int a_mode,
1021 const struct object_id *b_oid, int b_mode,
1022 const char *branch1,
1023 const char *branch2,
1024 struct merge_file_info *mfi)
1026 struct diff_filespec one, a, b;
1028 one.path = a.path = b.path = (char *)path;
1029 oidcpy(&one.oid, o_oid);
1031 oidcpy(&a.oid, a_oid);
1033 oidcpy(&b.oid, b_oid);
1035 return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
1038 static int handle_change_delete(struct merge_options *o,
1039 const char *path, const char *old_path,
1040 const struct object_id *o_oid, int o_mode,
1041 const struct object_id *changed_oid,
1043 const char *change_branch,
1044 const char *delete_branch,
1045 const char *change, const char *change_past)
1047 char *alt_path = NULL;
1048 const char *update_path = path;
1051 if (dir_in_way(path, !o->call_depth, 0)) {
1052 update_path = alt_path = unique_path(o, path, change_branch);
1055 if (o->call_depth) {
1057 * We cannot arbitrarily accept either a_sha or b_sha as
1058 * correct; since there is no true "middle point" between
1059 * them, simply reuse the base version for virtual merge base.
1061 ret = remove_file_from_cache(path);
1063 ret = update_file(o, 0, o_oid, o_mode, update_path);
1067 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1068 "and %s in %s. Version %s of %s left in tree."),
1069 change, path, delete_branch, change_past,
1070 change_branch, change_branch, path);
1072 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1073 "and %s to %s in %s. Version %s of %s left in tree."),
1074 change, old_path, delete_branch, change_past, path,
1075 change_branch, change_branch, path);
1079 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1080 "and %s in %s. Version %s of %s left in tree at %s."),
1081 change, path, delete_branch, change_past,
1082 change_branch, change_branch, path, alt_path);
1084 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1085 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1086 change, old_path, delete_branch, change_past, path,
1087 change_branch, change_branch, path, alt_path);
1091 * No need to call update_file() on path when change_branch ==
1092 * o->branch1 && !alt_path, since that would needlessly touch
1093 * path. We could call update_file_flags() with update_cache=0
1094 * and update_wd=0, but that's a no-op.
1096 if (change_branch != o->branch1 || alt_path)
1097 ret = update_file(o, 0, changed_oid, changed_mode, update_path);
1104 static int conflict_rename_delete(struct merge_options *o,
1105 struct diff_filepair *pair,
1106 const char *rename_branch,
1107 const char *delete_branch)
1109 const struct diff_filespec *orig = pair->one;
1110 const struct diff_filespec *dest = pair->two;
1112 if (handle_change_delete(o,
1113 o->call_depth ? orig->path : dest->path,
1114 o->call_depth ? NULL : orig->path,
1115 &orig->oid, orig->mode,
1116 &dest->oid, dest->mode,
1117 rename_branch, delete_branch,
1118 _("rename"), _("renamed")))
1122 return remove_file_from_cache(dest->path);
1124 return update_stages(o, dest->path, NULL,
1125 rename_branch == o->branch1 ? dest : NULL,
1126 rename_branch == o->branch1 ? NULL : dest);
1129 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1130 struct stage_data *entry,
1133 struct object_id *oid = &entry->stages[stage].oid;
1134 unsigned mode = entry->stages[stage].mode;
1135 if (mode == 0 || is_null_oid(oid))
1137 oidcpy(&target->oid, oid);
1138 target->mode = mode;
1142 static int handle_file(struct merge_options *o,
1143 struct diff_filespec *rename,
1145 struct rename_conflict_info *ci)
1147 char *dst_name = rename->path;
1148 struct stage_data *dst_entry;
1149 const char *cur_branch, *other_branch;
1150 struct diff_filespec other;
1151 struct diff_filespec *add;
1155 dst_entry = ci->dst_entry1;
1156 cur_branch = ci->branch1;
1157 other_branch = ci->branch2;
1159 dst_entry = ci->dst_entry2;
1160 cur_branch = ci->branch2;
1161 other_branch = ci->branch1;
1164 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
1166 char *add_name = unique_path(o, rename->path, other_branch);
1167 if (update_file(o, 0, &add->oid, add->mode, add_name))
1170 remove_file(o, 0, rename->path, 0);
1171 dst_name = unique_path(o, rename->path, cur_branch);
1173 if (dir_in_way(rename->path, !o->call_depth, 0)) {
1174 dst_name = unique_path(o, rename->path, cur_branch);
1175 output(o, 1, _("%s is a directory in %s adding as %s instead"),
1176 rename->path, other_branch, dst_name);
1179 if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
1180 ; /* fall through, do allow dst_name to be released */
1181 else if (stage == 2)
1182 ret = update_stages(o, rename->path, NULL, rename, add);
1184 ret = update_stages(o, rename->path, NULL, add, rename);
1186 if (dst_name != rename->path)
1192 static int conflict_rename_rename_1to2(struct merge_options *o,
1193 struct rename_conflict_info *ci)
1195 /* One file was renamed in both branches, but to different names. */
1196 struct diff_filespec *one = ci->pair1->one;
1197 struct diff_filespec *a = ci->pair1->two;
1198 struct diff_filespec *b = ci->pair2->two;
1200 output(o, 1, _("CONFLICT (rename/rename): "
1201 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1202 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1203 one->path, a->path, ci->branch1,
1204 one->path, b->path, ci->branch2,
1205 o->call_depth ? _(" (left unresolved)") : "");
1206 if (o->call_depth) {
1207 struct merge_file_info mfi;
1208 struct diff_filespec other;
1209 struct diff_filespec *add;
1210 if (merge_file_one(o, one->path,
1211 &one->oid, one->mode,
1214 ci->branch1, ci->branch2, &mfi))
1218 * FIXME: For rename/add-source conflicts (if we could detect
1219 * such), this is wrong. We should instead find a unique
1220 * pathname and then either rename the add-source file to that
1221 * unique path, or use that unique path instead of src here.
1223 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1227 * Above, we put the merged content at the merge-base's
1228 * path. Now we usually need to delete both a->path and
1229 * b->path. However, the rename on each side of the merge
1230 * could also be involved in a rename/add conflict. In
1231 * such cases, we should keep the added file around,
1232 * resolving the conflict at that path in its favor.
1234 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1236 if (update_file(o, 0, &add->oid, add->mode, a->path))
1240 remove_file_from_cache(a->path);
1241 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1243 if (update_file(o, 0, &add->oid, add->mode, b->path))
1247 remove_file_from_cache(b->path);
1248 } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
1254 static int conflict_rename_rename_2to1(struct merge_options *o,
1255 struct rename_conflict_info *ci)
1257 /* Two files, a & b, were renamed to the same thing, c. */
1258 struct diff_filespec *a = ci->pair1->one;
1259 struct diff_filespec *b = ci->pair2->one;
1260 struct diff_filespec *c1 = ci->pair1->two;
1261 struct diff_filespec *c2 = ci->pair2->two;
1262 char *path = c1->path; /* == c2->path */
1263 struct merge_file_info mfi_c1;
1264 struct merge_file_info mfi_c2;
1267 output(o, 1, _("CONFLICT (rename/rename): "
1268 "Rename %s->%s in %s. "
1269 "Rename %s->%s in %s"),
1270 a->path, c1->path, ci->branch1,
1271 b->path, c2->path, ci->branch2);
1273 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1274 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
1276 if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
1277 o->branch1, c1->path,
1278 o->branch2, ci->ren1_other.path, &mfi_c1) ||
1279 merge_file_special_markers(o, b, &ci->ren2_other, c2,
1280 o->branch1, ci->ren2_other.path,
1281 o->branch2, c2->path, &mfi_c2))
1284 if (o->call_depth) {
1286 * If mfi_c1.clean && mfi_c2.clean, then it might make
1287 * sense to do a two-way merge of those results. But, I
1288 * think in all cases, it makes sense to have the virtual
1289 * merge base just undo the renames; they can be detected
1290 * again later for the non-recursive merge.
1292 remove_file(o, 0, path, 0);
1293 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
1295 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1298 char *new_path1 = unique_path(o, path, ci->branch1);
1299 char *new_path2 = unique_path(o, path, ci->branch2);
1300 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
1301 a->path, new_path1, b->path, new_path2);
1302 remove_file(o, 0, path, 0);
1303 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
1305 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1315 * Get the diff_filepairs changed between o_tree and tree.
1317 static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
1318 struct tree *o_tree,
1321 struct diff_queue_struct *ret;
1322 struct diff_options opts;
1325 opts.flags.recursive = 1;
1326 opts.flags.rename_empty = 0;
1327 opts.detect_rename = DIFF_DETECT_RENAME;
1328 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
1329 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
1331 opts.rename_score = o->rename_score;
1332 opts.show_rename_progress = o->show_rename_progress;
1333 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1334 diff_setup_done(&opts);
1335 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1336 diffcore_std(&opts);
1337 if (opts.needed_rename_limit > o->needed_rename_limit)
1338 o->needed_rename_limit = opts.needed_rename_limit;
1340 ret = xmalloc(sizeof(*ret));
1341 *ret = diff_queued_diff;
1343 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1344 diff_queued_diff.nr = 0;
1345 diff_queued_diff.queue = NULL;
1351 * Get information of all renames which occurred in 'pairs', making use of
1352 * any implicit directory renames inferred from the other side of history.
1353 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
1354 * to be able to associate the correct cache entries with the rename
1355 * information; tree is always equal to either a_tree or b_tree.
1357 static struct string_list *get_renames(struct merge_options *o,
1358 struct diff_queue_struct *pairs,
1360 struct tree *o_tree,
1361 struct tree *a_tree,
1362 struct tree *b_tree,
1363 struct string_list *entries)
1366 struct string_list *renames;
1368 renames = xcalloc(1, sizeof(struct string_list));
1370 for (i = 0; i < pairs->nr; ++i) {
1371 struct string_list_item *item;
1373 struct diff_filepair *pair = pairs->queue[i];
1375 if (pair->status != 'R') {
1376 diff_free_filepair(pair);
1379 re = xmalloc(sizeof(*re));
1382 item = string_list_lookup(entries, re->pair->one->path);
1384 re->src_entry = insert_stage_data(re->pair->one->path,
1385 o_tree, a_tree, b_tree, entries);
1387 re->src_entry = item->util;
1389 item = string_list_lookup(entries, re->pair->two->path);
1391 re->dst_entry = insert_stage_data(re->pair->two->path,
1392 o_tree, a_tree, b_tree, entries);
1394 re->dst_entry = item->util;
1395 item = string_list_insert(renames, pair->one->path);
1401 static int process_renames(struct merge_options *o,
1402 struct string_list *a_renames,
1403 struct string_list *b_renames)
1405 int clean_merge = 1, i, j;
1406 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1407 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
1408 const struct rename *sre;
1410 for (i = 0; i < a_renames->nr; i++) {
1411 sre = a_renames->items[i].util;
1412 string_list_insert(&a_by_dst, sre->pair->two->path)->util
1415 for (i = 0; i < b_renames->nr; i++) {
1416 sre = b_renames->items[i].util;
1417 string_list_insert(&b_by_dst, sre->pair->two->path)->util
1421 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1422 struct string_list *renames1, *renames2Dst;
1423 struct rename *ren1 = NULL, *ren2 = NULL;
1424 const char *branch1, *branch2;
1425 const char *ren1_src, *ren1_dst;
1426 struct string_list_item *lookup;
1428 if (i >= a_renames->nr) {
1429 ren2 = b_renames->items[j++].util;
1430 } else if (j >= b_renames->nr) {
1431 ren1 = a_renames->items[i++].util;
1433 int compare = strcmp(a_renames->items[i].string,
1434 b_renames->items[j].string);
1436 ren1 = a_renames->items[i++].util;
1438 ren2 = b_renames->items[j++].util;
1441 /* TODO: refactor, so that 1/2 are not needed */
1443 renames1 = a_renames;
1444 renames2Dst = &b_by_dst;
1445 branch1 = o->branch1;
1446 branch2 = o->branch2;
1448 renames1 = b_renames;
1449 renames2Dst = &a_by_dst;
1450 branch1 = o->branch2;
1451 branch2 = o->branch1;
1455 if (ren1->processed)
1457 ren1->processed = 1;
1458 ren1->dst_entry->processed = 1;
1459 /* BUG: We should only mark src_entry as processed if we
1460 * are not dealing with a rename + add-source case.
1462 ren1->src_entry->processed = 1;
1464 ren1_src = ren1->pair->one->path;
1465 ren1_dst = ren1->pair->two->path;
1468 /* One file renamed on both sides */
1469 const char *ren2_src = ren2->pair->one->path;
1470 const char *ren2_dst = ren2->pair->two->path;
1471 enum rename_type rename_type;
1472 if (strcmp(ren1_src, ren2_src) != 0)
1473 die("BUG: ren1_src != ren2_src");
1474 ren2->dst_entry->processed = 1;
1475 ren2->processed = 1;
1476 if (strcmp(ren1_dst, ren2_dst) != 0) {
1477 rename_type = RENAME_ONE_FILE_TO_TWO;
1480 rename_type = RENAME_ONE_FILE_TO_ONE;
1481 /* BUG: We should only remove ren1_src in
1482 * the base stage (think of rename +
1483 * add-source cases).
1485 remove_file(o, 1, ren1_src, 1);
1486 update_entry(ren1->dst_entry,
1491 setup_rename_conflict_info(rename_type,
1501 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1502 /* Two different files renamed to the same thing */
1504 ren2 = lookup->util;
1505 ren2_dst = ren2->pair->two->path;
1506 if (strcmp(ren1_dst, ren2_dst) != 0)
1507 die("BUG: ren1_dst != ren2_dst");
1510 ren2->processed = 1;
1512 * BUG: We should only mark src_entry as processed
1513 * if we are not dealing with a rename + add-source
1516 ren2->src_entry->processed = 1;
1518 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1530 /* Renamed in 1, maybe changed in 2 */
1531 /* we only use sha1 and mode of these */
1532 struct diff_filespec src_other, dst_other;
1536 * unpack_trees loads entries from common-commit
1537 * into stage 1, from head-commit into stage 2, and
1538 * from merge-commit into stage 3. We keep track
1539 * of which side corresponds to the rename.
1541 int renamed_stage = a_renames == renames1 ? 2 : 3;
1542 int other_stage = a_renames == renames1 ? 3 : 2;
1544 /* BUG: We should only remove ren1_src in the base
1545 * stage and in other_stage (think of rename +
1548 remove_file(o, 1, ren1_src,
1549 renamed_stage == 2 || !was_tracked(ren1_src));
1551 oidcpy(&src_other.oid,
1552 &ren1->src_entry->stages[other_stage].oid);
1553 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1554 oidcpy(&dst_other.oid,
1555 &ren1->dst_entry->stages[other_stage].oid);
1556 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1559 if (oid_eq(&src_other.oid, &null_oid)) {
1560 setup_rename_conflict_info(RENAME_DELETE,
1570 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1571 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
1573 * Added file on the other side identical to
1574 * the file being renamed: clean merge.
1575 * Also, there is no need to overwrite the
1576 * file already in the working copy, so call
1577 * update_file_flags() instead of
1580 if (update_file_flags(o,
1581 &ren1->pair->two->oid,
1582 ren1->pair->two->mode,
1584 1, /* update_cache */
1587 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
1590 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1592 ren1_src, ren1_dst, branch1,
1594 if (o->call_depth) {
1595 struct merge_file_info mfi;
1596 if (merge_file_one(o, ren1_dst, &null_oid, 0,
1597 &ren1->pair->two->oid,
1598 ren1->pair->two->mode,
1601 branch1, branch2, &mfi)) {
1603 goto cleanup_and_return;
1605 output(o, 1, _("Adding merged %s"), ren1_dst);
1606 if (update_file(o, 0, &mfi.oid,
1607 mfi.mode, ren1_dst))
1611 char *new_path = unique_path(o, ren1_dst, branch2);
1612 output(o, 1, _("Adding as %s instead"), new_path);
1613 if (update_file(o, 0, &dst_other.oid,
1614 dst_other.mode, new_path))
1621 if (clean_merge < 0)
1622 goto cleanup_and_return;
1624 struct diff_filespec *one, *a, *b;
1625 src_other.path = (char *)ren1_src;
1627 one = ren1->pair->one;
1628 if (a_renames == renames1) {
1629 a = ren1->pair->two;
1632 b = ren1->pair->two;
1635 update_entry(ren1->dst_entry, one, a, b);
1636 setup_rename_conflict_info(RENAME_NORMAL,
1650 string_list_clear(&a_by_dst, 0);
1651 string_list_clear(&b_by_dst, 0);
1656 struct rename_info {
1657 struct string_list *head_renames;
1658 struct string_list *merge_renames;
1661 static int handle_renames(struct merge_options *o,
1662 struct tree *common,
1665 struct string_list *entries,
1666 struct rename_info *ri)
1668 struct diff_queue_struct *head_pairs, *merge_pairs;
1671 ri->head_renames = NULL;
1672 ri->merge_renames = NULL;
1674 if (!o->detect_rename)
1677 head_pairs = get_diffpairs(o, common, head);
1678 merge_pairs = get_diffpairs(o, common, merge);
1680 ri->head_renames = get_renames(o, head_pairs, head,
1681 common, head, merge, entries);
1682 ri->merge_renames = get_renames(o, merge_pairs, merge,
1683 common, head, merge, entries);
1684 clean = process_renames(o, ri->head_renames, ri->merge_renames);
1687 * Some cleanup is deferred until cleanup_renames() because the
1688 * data structures are still needed and referenced in
1689 * process_entry(). But there are a few things we can free now.
1692 free(head_pairs->queue);
1694 free(merge_pairs->queue);
1700 static void cleanup_rename(struct string_list *rename)
1702 const struct rename *re;
1708 for (i = 0; i < rename->nr; i++) {
1709 re = rename->items[i].util;
1710 diff_free_filepair(re->pair);
1712 string_list_clear(rename, 1);
1716 static void cleanup_renames(struct rename_info *re_info)
1718 cleanup_rename(re_info->head_renames);
1719 cleanup_rename(re_info->merge_renames);
1722 static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
1724 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
1727 static int read_oid_strbuf(struct merge_options *o,
1728 const struct object_id *oid, struct strbuf *dst)
1731 enum object_type type;
1733 buf = read_sha1_file(oid->hash, &type, &size);
1735 return err(o, _("cannot read object %s"), oid_to_hex(oid));
1736 if (type != OBJ_BLOB) {
1738 return err(o, _("object %s is not a blob"), oid_to_hex(oid));
1740 strbuf_attach(dst, buf, size, size + 1);
1744 static int blob_unchanged(struct merge_options *opt,
1745 const struct object_id *o_oid,
1747 const struct object_id *a_oid,
1749 int renormalize, const char *path)
1751 struct strbuf o = STRBUF_INIT;
1752 struct strbuf a = STRBUF_INIT;
1753 int ret = 0; /* assume changed for safety */
1755 if (a_mode != o_mode)
1757 if (oid_eq(o_oid, a_oid))
1762 assert(o_oid && a_oid);
1763 if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
1766 * Note: binary | is used so that both renormalizations are
1767 * performed. Comparison can be skipped if both files are
1768 * unchanged since their sha1s have already been compared.
1770 if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) |
1771 renormalize_buffer(&the_index, path, a.buf, a.len, &a))
1772 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1780 static int handle_modify_delete(struct merge_options *o,
1782 struct object_id *o_oid, int o_mode,
1783 struct object_id *a_oid, int a_mode,
1784 struct object_id *b_oid, int b_mode)
1786 const char *modify_branch, *delete_branch;
1787 struct object_id *changed_oid;
1791 modify_branch = o->branch1;
1792 delete_branch = o->branch2;
1793 changed_oid = a_oid;
1794 changed_mode = a_mode;
1796 modify_branch = o->branch2;
1797 delete_branch = o->branch1;
1798 changed_oid = b_oid;
1799 changed_mode = b_mode;
1802 return handle_change_delete(o,
1805 changed_oid, changed_mode,
1806 modify_branch, delete_branch,
1807 _("modify"), _("modified"));
1810 static int merge_content(struct merge_options *o,
1812 struct object_id *o_oid, int o_mode,
1813 struct object_id *a_oid, int a_mode,
1814 struct object_id *b_oid, int b_mode,
1815 struct rename_conflict_info *rename_conflict_info)
1817 const char *reason = _("content");
1818 const char *path1 = NULL, *path2 = NULL;
1819 struct merge_file_info mfi;
1820 struct diff_filespec one, a, b;
1821 unsigned df_conflict_remains = 0;
1824 reason = _("add/add");
1825 o_oid = (struct object_id *)&null_oid;
1827 one.path = a.path = b.path = (char *)path;
1828 oidcpy(&one.oid, o_oid);
1830 oidcpy(&a.oid, a_oid);
1832 oidcpy(&b.oid, b_oid);
1835 if (rename_conflict_info) {
1836 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1838 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1839 pair1->two->path : pair1->one->path;
1840 /* If rename_conflict_info->pair2 != NULL, we are in
1841 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1844 path2 = (rename_conflict_info->pair2 ||
1845 o->branch2 == rename_conflict_info->branch1) ?
1846 pair1->two->path : pair1->one->path;
1848 if (dir_in_way(path, !o->call_depth,
1849 S_ISGITLINK(pair1->two->mode)))
1850 df_conflict_remains = 1;
1852 if (merge_file_special_markers(o, &one, &a, &b,
1854 o->branch2, path2, &mfi))
1857 if (mfi.clean && !df_conflict_remains &&
1858 oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
1859 int path_renamed_outside_HEAD;
1860 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1862 * The content merge resulted in the same file contents we
1863 * already had. We can return early if those file contents
1864 * are recorded at the correct path (which may not be true
1865 * if the merge involves a rename).
1867 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1868 if (!path_renamed_outside_HEAD) {
1869 add_cacheinfo(o, mfi.mode, &mfi.oid, path,
1870 0, (!o->call_depth), 0);
1874 output(o, 2, _("Auto-merging %s"), path);
1877 if (S_ISGITLINK(mfi.mode))
1878 reason = _("submodule");
1879 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
1881 if (rename_conflict_info && !df_conflict_remains)
1882 if (update_stages(o, path, &one, &a, &b))
1886 if (df_conflict_remains) {
1888 if (o->call_depth) {
1889 remove_file_from_cache(path);
1892 if (update_stages(o, path, &one, &a, &b))
1895 int file_from_stage2 = was_tracked(path);
1896 struct diff_filespec merged;
1897 oidcpy(&merged.oid, &mfi.oid);
1898 merged.mode = mfi.mode;
1900 if (update_stages(o, path, NULL,
1901 file_from_stage2 ? &merged : NULL,
1902 file_from_stage2 ? NULL : &merged))
1907 new_path = unique_path(o, path, rename_conflict_info->branch1);
1908 output(o, 1, _("Adding as %s instead"), new_path);
1909 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
1915 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
1920 /* Per entry merge function */
1921 static int process_entry(struct merge_options *o,
1922 const char *path, struct stage_data *entry)
1924 int clean_merge = 1;
1925 int normalize = o->renormalize;
1926 unsigned o_mode = entry->stages[1].mode;
1927 unsigned a_mode = entry->stages[2].mode;
1928 unsigned b_mode = entry->stages[3].mode;
1929 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
1930 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
1931 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
1933 entry->processed = 1;
1934 if (entry->rename_conflict_info) {
1935 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
1936 switch (conflict_info->rename_type) {
1938 case RENAME_ONE_FILE_TO_ONE:
1939 clean_merge = merge_content(o, path,
1940 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
1945 if (conflict_rename_delete(o,
1946 conflict_info->pair1,
1947 conflict_info->branch1,
1948 conflict_info->branch2))
1951 case RENAME_ONE_FILE_TO_TWO:
1953 if (conflict_rename_rename_1to2(o, conflict_info))
1956 case RENAME_TWO_FILES_TO_ONE:
1958 if (conflict_rename_rename_2to1(o, conflict_info))
1962 entry->processed = 0;
1965 } else if (o_oid && (!a_oid || !b_oid)) {
1966 /* Case A: Deleted in one */
1967 if ((!a_oid && !b_oid) ||
1968 (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
1969 (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
1970 /* Deleted in both or deleted in one and
1971 * unchanged in the other */
1973 output(o, 2, _("Removing %s"), path);
1974 /* do not touch working file if it did not exist */
1975 remove_file(o, 1, path, !a_oid);
1977 /* Modify/delete; deleted side may have put a directory in the way */
1979 if (handle_modify_delete(o, path, o_oid, o_mode,
1980 a_oid, a_mode, b_oid, b_mode))
1983 } else if ((!o_oid && a_oid && !b_oid) ||
1984 (!o_oid && !a_oid && b_oid)) {
1985 /* Case B: Added in one. */
1986 /* [nothing|directory] -> ([nothing|directory], file) */
1988 const char *add_branch;
1989 const char *other_branch;
1991 const struct object_id *oid;
1995 add_branch = o->branch1;
1996 other_branch = o->branch2;
1999 conf = _("file/directory");
2001 add_branch = o->branch2;
2002 other_branch = o->branch1;
2005 conf = _("directory/file");
2007 if (dir_in_way(path,
2008 !o->call_depth && !S_ISGITLINK(a_mode),
2010 char *new_path = unique_path(o, path, add_branch);
2012 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
2014 conf, path, other_branch, path, new_path);
2015 if (update_file(o, 0, oid, mode, new_path))
2017 else if (o->call_depth)
2018 remove_file_from_cache(path);
2021 output(o, 2, _("Adding %s"), path);
2022 /* do not overwrite file if already present */
2023 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
2026 } else if (a_oid && b_oid) {
2027 /* Case C: Added in both (check for same permissions) and */
2028 /* case D: Modified in both, but differently. */
2029 clean_merge = merge_content(o, path,
2030 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
2032 } else if (!o_oid && !a_oid && !b_oid) {
2034 * this entry was deleted altogether. a_mode == 0 means
2035 * we had that path and want to actively remove it.
2037 remove_file(o, 1, path, !a_mode);
2039 die("BUG: fatal merge failure, shouldn't happen.");
2044 int merge_trees(struct merge_options *o,
2047 struct tree *common,
2048 struct tree **result)
2052 if (o->subtree_shift) {
2053 merge = shift_tree_object(head, merge, o->subtree_shift);
2054 common = shift_tree_object(head, common, o->subtree_shift);
2057 if (oid_eq(&common->object.oid, &merge->object.oid)) {
2058 struct strbuf sb = STRBUF_INIT;
2060 if (!o->call_depth && index_has_changes(&sb)) {
2061 err(o, _("Dirty index: cannot merge (dirty: %s)"),
2065 output(o, 0, _("Already up to date!"));
2070 code = git_merge_trees(o->call_depth, common, head, merge);
2073 if (show(o, 4) || o->call_depth)
2074 err(o, _("merging of trees %s and %s failed"),
2075 oid_to_hex(&head->object.oid),
2076 oid_to_hex(&merge->object.oid));
2080 if (unmerged_cache()) {
2081 struct string_list *entries;
2082 struct rename_info re_info;
2085 * Only need the hashmap while processing entries, so
2086 * initialize it here and free it when we are done running
2087 * through the entries. Keeping it in the merge_options as
2088 * opposed to decaring a local hashmap is for convenience
2089 * so that we don't have to pass it to around.
2091 hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
2092 get_files_dirs(o, head);
2093 get_files_dirs(o, merge);
2095 entries = get_unmerged();
2096 clean = handle_renames(o, common, head, merge, entries,
2098 record_df_conflict_files(o, entries);
2101 for (i = entries->nr-1; 0 <= i; i--) {
2102 const char *path = entries->items[i].string;
2103 struct stage_data *e = entries->items[i].util;
2104 if (!e->processed) {
2105 int ret = process_entry(o, path, e);
2114 for (i = 0; i < entries->nr; i++) {
2115 struct stage_data *e = entries->items[i].util;
2117 die("BUG: unprocessed path??? %s",
2118 entries->items[i].string);
2122 cleanup_renames(&re_info);
2124 string_list_clear(entries, 1);
2127 hashmap_free(&o->current_file_dir_set, 1);
2135 if (o->call_depth && !(*result = write_tree_from_memory(o)))
2141 static struct commit_list *reverse_commit_list(struct commit_list *list)
2143 struct commit_list *next = NULL, *current, *backup;
2144 for (current = list; current; current = backup) {
2145 backup = current->next;
2146 current->next = next;
2153 * Merge the commits h1 and h2, return the resulting virtual
2154 * commit object and a flag indicating the cleanness of the merge.
2156 int merge_recursive(struct merge_options *o,
2159 struct commit_list *ca,
2160 struct commit **result)
2162 struct commit_list *iter;
2163 struct commit *merged_common_ancestors;
2164 struct tree *mrtree = mrtree;
2168 output(o, 4, _("Merging:"));
2169 output_commit_title(o, h1);
2170 output_commit_title(o, h2);
2174 ca = get_merge_bases(h1, h2);
2175 ca = reverse_commit_list(ca);
2179 unsigned cnt = commit_list_count(ca);
2181 output(o, 5, Q_("found %u common ancestor:",
2182 "found %u common ancestors:", cnt), cnt);
2183 for (iter = ca; iter; iter = iter->next)
2184 output_commit_title(o, iter->item);
2187 merged_common_ancestors = pop_commit(&ca);
2188 if (merged_common_ancestors == NULL) {
2189 /* if there is no common ancestor, use an empty tree */
2192 tree = lookup_tree(the_hash_algo->empty_tree);
2193 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
2196 for (iter = ca; iter; iter = iter->next) {
2197 const char *saved_b1, *saved_b2;
2200 * When the merge fails, the result contains files
2201 * with conflict markers. The cleanness flag is
2202 * ignored (unless indicating an error), it was never
2203 * actually used, as result of merge_trees has always
2204 * overwritten it: the committed "conflicts" were
2208 saved_b1 = o->branch1;
2209 saved_b2 = o->branch2;
2210 o->branch1 = "Temporary merge branch 1";
2211 o->branch2 = "Temporary merge branch 2";
2212 if (merge_recursive(o, merged_common_ancestors, iter->item,
2213 NULL, &merged_common_ancestors) < 0)
2215 o->branch1 = saved_b1;
2216 o->branch2 = saved_b2;
2219 if (!merged_common_ancestors)
2220 return err(o, _("merge returned no commit"));
2227 o->ancestor = "merged common ancestors";
2228 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
2235 if (o->call_depth) {
2236 *result = make_virtual_commit(mrtree, "merged tree");
2237 commit_list_insert(h1, &(*result)->parents);
2238 commit_list_insert(h2, &(*result)->parents->next);
2241 if (!o->call_depth && o->buffer_output < 2)
2242 strbuf_release(&o->obuf);
2244 diff_warn_rename_limit("merge.renamelimit",
2245 o->needed_rename_limit, 0);
2249 static struct commit *get_ref(const struct object_id *oid, const char *name)
2251 struct object *object;
2253 object = deref_tag(parse_object(oid), name, strlen(name));
2256 if (object->type == OBJ_TREE)
2257 return make_virtual_commit((struct tree*)object, name);
2258 if (object->type != OBJ_COMMIT)
2260 if (parse_commit((struct commit *)object))
2262 return (struct commit *)object;
2265 int merge_recursive_generic(struct merge_options *o,
2266 const struct object_id *head,
2267 const struct object_id *merge,
2269 const struct object_id **base_list,
2270 struct commit **result)
2273 struct lock_file lock = LOCK_INIT;
2274 struct commit *head_commit = get_ref(head, o->branch1);
2275 struct commit *next_commit = get_ref(merge, o->branch2);
2276 struct commit_list *ca = NULL;
2280 for (i = 0; i < num_base_list; ++i) {
2281 struct commit *base;
2282 if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
2283 return err(o, _("Could not parse object '%s'"),
2284 oid_to_hex(base_list[i]));
2285 commit_list_insert(base, &ca);
2289 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
2290 clean = merge_recursive(o, head_commit, next_commit, ca,
2295 if (active_cache_changed &&
2296 write_locked_index(&the_index, &lock, COMMIT_LOCK))
2297 return err(o, _("Unable to write index."));
2299 return clean ? 0 : 1;
2302 static void merge_recursive_config(struct merge_options *o)
2304 git_config_get_int("merge.verbosity", &o->verbosity);
2305 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
2306 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
2307 git_config(git_xmerge_config, NULL);
2310 void init_merge_options(struct merge_options *o)
2312 const char *merge_verbosity;
2313 memset(o, 0, sizeof(struct merge_options));
2315 o->buffer_output = 1;
2316 o->diff_rename_limit = -1;
2317 o->merge_rename_limit = -1;
2319 o->detect_rename = 1;
2320 merge_recursive_config(o);
2321 merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
2322 if (merge_verbosity)
2323 o->verbosity = strtol(merge_verbosity, NULL, 10);
2324 if (o->verbosity >= 5)
2325 o->buffer_output = 0;
2326 strbuf_init(&o->obuf, 0);
2327 string_list_init(&o->df_conflict_file_set, 1);
2330 int parse_merge_opt(struct merge_options *o, const char *s)
2336 if (!strcmp(s, "ours"))
2337 o->recursive_variant = MERGE_RECURSIVE_OURS;
2338 else if (!strcmp(s, "theirs"))
2339 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2340 else if (!strcmp(s, "subtree"))
2341 o->subtree_shift = "";
2342 else if (skip_prefix(s, "subtree=", &arg))
2343 o->subtree_shift = arg;
2344 else if (!strcmp(s, "patience"))
2345 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2346 else if (!strcmp(s, "histogram"))
2347 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2348 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
2349 long value = parse_algorithm_value(arg);
2352 /* clear out previous settings */
2353 DIFF_XDL_CLR(o, NEED_MINIMAL);
2354 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2355 o->xdl_opts |= value;
2357 else if (!strcmp(s, "ignore-space-change"))
2358 DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
2359 else if (!strcmp(s, "ignore-all-space"))
2360 DIFF_XDL_SET(o, IGNORE_WHITESPACE);
2361 else if (!strcmp(s, "ignore-space-at-eol"))
2362 DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
2363 else if (!strcmp(s, "ignore-cr-at-eol"))
2364 DIFF_XDL_SET(o, IGNORE_CR_AT_EOL);
2365 else if (!strcmp(s, "renormalize"))
2367 else if (!strcmp(s, "no-renormalize"))
2369 else if (!strcmp(s, "no-renames"))
2370 o->detect_rename = 0;
2371 else if (!strcmp(s, "find-renames")) {
2372 o->detect_rename = 1;
2373 o->rename_score = 0;
2375 else if (skip_prefix(s, "find-renames=", &arg) ||
2376 skip_prefix(s, "rename-threshold=", &arg)) {
2377 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
2379 o->detect_rename = 1;