2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
9 #include "cache-tree.h"
13 #include "tree-walk.h"
17 #include "unpack-trees.h"
18 #include "string-list.h"
19 #include "xdiff-interface.h"
22 #include "merge-recursive.h"
24 #include "submodule.h"
26 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
27 const char *subtree_shift)
29 struct object_id shifted;
31 if (!*subtree_shift) {
32 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
34 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
37 if (!oidcmp(&two->object.oid, &shifted))
39 return lookup_tree(shifted.hash);
42 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
44 struct commit *commit = alloc_commit_node();
45 struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
48 desc->obj = (struct object *)commit;
51 commit->object.parsed = 1;
56 * Since we use get_tree_entry(), which does not put the read object into
57 * the object pool, we cannot rely on a == b.
59 static int sha_eq(const unsigned char *a, const unsigned char *b)
63 return a && b && hashcmp(a, b) == 0;
69 RENAME_ONE_FILE_TO_ONE,
70 RENAME_ONE_FILE_TO_TWO,
71 RENAME_TWO_FILES_TO_ONE
74 struct rename_conflict_info {
75 enum rename_type rename_type;
76 struct diff_filepair *pair1;
77 struct diff_filepair *pair2;
80 struct stage_data *dst_entry1;
81 struct stage_data *dst_entry2;
82 struct diff_filespec ren1_other;
83 struct diff_filespec ren2_other;
87 * Since we want to write the index eventually, we cannot reuse the index
88 * for these (temporary) data.
93 unsigned char sha[20];
95 struct rename_conflict_info *rename_conflict_info;
99 static inline void setup_rename_conflict_info(enum rename_type rename_type,
100 struct diff_filepair *pair1,
101 struct diff_filepair *pair2,
104 struct stage_data *dst_entry1,
105 struct stage_data *dst_entry2,
106 struct merge_options *o,
107 struct stage_data *src_entry1,
108 struct stage_data *src_entry2)
110 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
111 ci->rename_type = rename_type;
113 ci->branch1 = branch1;
114 ci->branch2 = branch2;
116 ci->dst_entry1 = dst_entry1;
117 dst_entry1->rename_conflict_info = ci;
118 dst_entry1->processed = 0;
120 assert(!pair2 == !dst_entry2);
122 ci->dst_entry2 = dst_entry2;
124 dst_entry2->rename_conflict_info = ci;
127 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
129 * For each rename, there could have been
130 * modifications on the side of history where that
131 * file was not renamed.
133 int ostage1 = o->branch1 == branch1 ? 3 : 2;
134 int ostage2 = ostage1 ^ 1;
136 ci->ren1_other.path = pair1->one->path;
137 hashcpy(ci->ren1_other.oid.hash,
138 src_entry1->stages[ostage1].sha);
139 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
141 ci->ren2_other.path = pair2->one->path;
142 hashcpy(ci->ren2_other.oid.hash,
143 src_entry2->stages[ostage2].sha);
144 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
148 static int show(struct merge_options *o, int v)
150 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
153 static void flush_output(struct merge_options *o)
156 fputs(o->obuf.buf, stdout);
157 strbuf_reset(&o->obuf);
161 __attribute__((format (printf, 3, 4)))
162 static void output(struct merge_options *o, int v, const char *fmt, ...)
169 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
172 strbuf_vaddf(&o->obuf, fmt, ap);
175 strbuf_addch(&o->obuf, '\n');
176 if (!o->buffer_output)
180 static void output_commit_title(struct merge_options *o, struct commit *commit)
184 for (i = o->call_depth; i--;)
187 printf("virtual %s\n", merge_remote_util(commit)->name);
189 printf("%s ", find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
190 if (parse_commit(commit) != 0)
191 printf(_("(bad commit)\n"));
194 const char *msg = get_commit_buffer(commit, NULL);
195 int len = find_commit_subject(msg, &title);
197 printf("%.*s\n", len, title);
198 unuse_commit_buffer(commit, msg);
203 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
204 const char *path, int stage, int refresh, int options)
206 struct cache_entry *ce;
207 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage,
208 (refresh ? (CE_MATCH_REFRESH |
209 CE_MATCH_IGNORE_MISSING) : 0 ));
211 return error(_("addinfo_cache failed for path '%s'"), path);
212 return add_cache_entry(ce, options);
215 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
218 init_tree_desc(desc, tree->buffer, tree->size);
221 static int git_merge_trees(int index_only,
227 struct tree_desc t[3];
228 struct unpack_trees_options opts;
230 memset(&opts, 0, sizeof(opts));
237 opts.fn = threeway_merge;
238 opts.src_index = &the_index;
239 opts.dst_index = &the_index;
240 setup_unpack_trees_porcelain(&opts, "merge");
242 init_tree_desc_from_tree(t+0, common);
243 init_tree_desc_from_tree(t+1, head);
244 init_tree_desc_from_tree(t+2, merge);
246 rc = unpack_trees(3, t, &opts);
247 cache_tree_free(&active_cache_tree);
251 struct tree *write_tree_from_memory(struct merge_options *o)
253 struct tree *result = NULL;
255 if (unmerged_cache()) {
257 fprintf(stderr, "BUG: There are unmerged index entries:\n");
258 for (i = 0; i < active_nr; i++) {
259 const struct cache_entry *ce = active_cache[i];
261 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
262 (int)ce_namelen(ce), ce->name);
264 die("Bug in merge-recursive.c");
267 if (!active_cache_tree)
268 active_cache_tree = cache_tree();
270 if (!cache_tree_fully_valid(active_cache_tree) &&
271 cache_tree_update(&the_index, 0) < 0)
272 die(_("error building trees"));
274 result = lookup_tree(active_cache_tree->sha1);
279 static int save_files_dirs(const unsigned char *sha1,
280 struct strbuf *base, const char *path,
281 unsigned int mode, int stage, void *context)
283 int baselen = base->len;
284 struct merge_options *o = context;
286 strbuf_addstr(base, path);
289 string_list_insert(&o->current_directory_set, base->buf);
291 string_list_insert(&o->current_file_set, base->buf);
293 strbuf_setlen(base, baselen);
294 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
297 static int get_files_dirs(struct merge_options *o, struct tree *tree)
300 struct pathspec match_all;
301 memset(&match_all, 0, sizeof(match_all));
302 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
304 n = o->current_file_set.nr + o->current_directory_set.nr;
309 * Returns an index_entry instance which doesn't have to correspond to
310 * a real cache entry in Git's index.
312 static struct stage_data *insert_stage_data(const char *path,
313 struct tree *o, struct tree *a, struct tree *b,
314 struct string_list *entries)
316 struct string_list_item *item;
317 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
318 get_tree_entry(o->object.oid.hash, path,
319 e->stages[1].sha, &e->stages[1].mode);
320 get_tree_entry(a->object.oid.hash, path,
321 e->stages[2].sha, &e->stages[2].mode);
322 get_tree_entry(b->object.oid.hash, path,
323 e->stages[3].sha, &e->stages[3].mode);
324 item = string_list_insert(entries, path);
330 * Create a dictionary mapping file names to stage_data objects. The
331 * dictionary contains one entry for every path with a non-zero stage entry.
333 static struct string_list *get_unmerged(void)
335 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
338 unmerged->strdup_strings = 1;
340 for (i = 0; i < active_nr; i++) {
341 struct string_list_item *item;
342 struct stage_data *e;
343 const struct cache_entry *ce = active_cache[i];
347 item = string_list_lookup(unmerged, ce->name);
349 item = string_list_insert(unmerged, ce->name);
350 item->util = xcalloc(1, sizeof(struct stage_data));
353 e->stages[ce_stage(ce)].mode = ce->ce_mode;
354 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
360 static int string_list_df_name_compare(const void *a, const void *b)
362 const struct string_list_item *one = a;
363 const struct string_list_item *two = b;
364 int onelen = strlen(one->string);
365 int twolen = strlen(two->string);
367 * Here we only care that entries for D/F conflicts are
368 * adjacent, in particular with the file of the D/F conflict
369 * appearing before files below the corresponding directory.
370 * The order of the rest of the list is irrelevant for us.
372 * To achieve this, we sort with df_name_compare and provide
373 * the mode S_IFDIR so that D/F conflicts will sort correctly.
374 * We use the mode S_IFDIR for everything else for simplicity,
375 * since in other cases any changes in their order due to
376 * sorting cause no problems for us.
378 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
379 two->string, twolen, S_IFDIR);
381 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
382 * that 'foo' comes before 'foo/bar'.
386 return onelen - twolen;
389 static void record_df_conflict_files(struct merge_options *o,
390 struct string_list *entries)
392 /* If there is a D/F conflict and the file for such a conflict
393 * currently exist in the working tree, we want to allow it to be
394 * removed to make room for the corresponding directory if needed.
395 * The files underneath the directories of such D/F conflicts will
396 * be processed before the corresponding file involved in the D/F
397 * conflict. If the D/F directory ends up being removed by the
398 * merge, then we won't have to touch the D/F file. If the D/F
399 * directory needs to be written to the working copy, then the D/F
400 * file will simply be removed (in make_room_for_path()) to make
401 * room for the necessary paths. Note that if both the directory
402 * and the file need to be present, then the D/F file will be
403 * reinstated with a new unique name at the time it is processed.
405 struct string_list df_sorted_entries;
406 const char *last_file = NULL;
411 * If we're merging merge-bases, we don't want to bother with
412 * any working directory changes.
417 /* Ensure D/F conflicts are adjacent in the entries list. */
418 memset(&df_sorted_entries, 0, sizeof(struct string_list));
419 for (i = 0; i < entries->nr; i++) {
420 struct string_list_item *next = &entries->items[i];
421 string_list_append(&df_sorted_entries, next->string)->util =
424 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
425 string_list_df_name_compare);
427 string_list_clear(&o->df_conflict_file_set, 1);
428 for (i = 0; i < df_sorted_entries.nr; i++) {
429 const char *path = df_sorted_entries.items[i].string;
430 int len = strlen(path);
431 struct stage_data *e = df_sorted_entries.items[i].util;
434 * Check if last_file & path correspond to a D/F conflict;
435 * i.e. whether path is last_file+'/'+<something>.
436 * If so, record that it's okay to remove last_file to make
437 * room for path and friends if needed.
441 memcmp(path, last_file, last_len) == 0 &&
442 path[last_len] == '/') {
443 string_list_insert(&o->df_conflict_file_set, last_file);
447 * Determine whether path could exist as a file in the
448 * working directory as a possible D/F conflict. This
449 * will only occur when it exists in stage 2 as a
452 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
459 string_list_clear(&df_sorted_entries, 0);
463 struct diff_filepair *pair;
464 struct stage_data *src_entry;
465 struct stage_data *dst_entry;
466 unsigned processed:1;
470 * Get information of all renames which occurred between 'o_tree' and
471 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
472 * 'b_tree') to be able to associate the correct cache entries with
473 * the rename information. 'tree' is always equal to either a_tree or b_tree.
475 static struct string_list *get_renames(struct merge_options *o,
480 struct string_list *entries)
483 struct string_list *renames;
484 struct diff_options opts;
486 renames = xcalloc(1, sizeof(struct string_list));
487 if (!o->detect_rename)
491 DIFF_OPT_SET(&opts, RECURSIVE);
492 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
493 opts.detect_rename = DIFF_DETECT_RENAME;
494 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
495 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
497 opts.rename_score = o->rename_score;
498 opts.show_rename_progress = o->show_rename_progress;
499 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
500 diff_setup_done(&opts);
501 diff_tree_sha1(o_tree->object.oid.hash, tree->object.oid.hash, "", &opts);
503 if (opts.needed_rename_limit > o->needed_rename_limit)
504 o->needed_rename_limit = opts.needed_rename_limit;
505 for (i = 0; i < diff_queued_diff.nr; ++i) {
506 struct string_list_item *item;
508 struct diff_filepair *pair = diff_queued_diff.queue[i];
509 if (pair->status != 'R') {
510 diff_free_filepair(pair);
513 re = xmalloc(sizeof(*re));
516 item = string_list_lookup(entries, re->pair->one->path);
518 re->src_entry = insert_stage_data(re->pair->one->path,
519 o_tree, a_tree, b_tree, entries);
521 re->src_entry = item->util;
523 item = string_list_lookup(entries, re->pair->two->path);
525 re->dst_entry = insert_stage_data(re->pair->two->path,
526 o_tree, a_tree, b_tree, entries);
528 re->dst_entry = item->util;
529 item = string_list_insert(renames, pair->one->path);
532 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
533 diff_queued_diff.nr = 0;
538 static int update_stages(const char *path, const struct diff_filespec *o,
539 const struct diff_filespec *a,
540 const struct diff_filespec *b)
544 * NOTE: It is usually a bad idea to call update_stages on a path
545 * before calling update_file on that same path, since it can
546 * sometimes lead to spurious "refusing to lose untracked file..."
547 * messages from update_file (via make_room_for path via
548 * would_lose_untracked). Instead, reverse the order of the calls
549 * (executing update_file first and then update_stages).
552 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
554 if (remove_file_from_cache(path))
557 if (add_cacheinfo(o->mode, o->oid.hash, path, 1, 0, options))
560 if (add_cacheinfo(a->mode, a->oid.hash, path, 2, 0, options))
563 if (add_cacheinfo(b->mode, b->oid.hash, path, 3, 0, options))
568 static void update_entry(struct stage_data *entry,
569 struct diff_filespec *o,
570 struct diff_filespec *a,
571 struct diff_filespec *b)
573 entry->processed = 0;
574 entry->stages[1].mode = o->mode;
575 entry->stages[2].mode = a->mode;
576 entry->stages[3].mode = b->mode;
577 hashcpy(entry->stages[1].sha, o->oid.hash);
578 hashcpy(entry->stages[2].sha, a->oid.hash);
579 hashcpy(entry->stages[3].sha, b->oid.hash);
582 static int remove_file(struct merge_options *o, int clean,
583 const char *path, int no_wd)
585 int update_cache = o->call_depth || clean;
586 int update_working_directory = !o->call_depth && !no_wd;
589 if (remove_file_from_cache(path))
592 if (update_working_directory) {
594 struct cache_entry *ce;
595 ce = cache_file_exists(path, strlen(path), ignore_case);
596 if (ce && ce_stage(ce) == 0)
599 if (remove_path(path))
605 /* add a string to a strbuf, but converting "/" to "_" */
606 static void add_flattened_path(struct strbuf *out, const char *s)
609 strbuf_addstr(out, s);
610 for (; i < out->len; i++)
611 if (out->buf[i] == '/')
615 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
617 struct strbuf newpath = STRBUF_INIT;
621 strbuf_addf(&newpath, "%s~", path);
622 add_flattened_path(&newpath, branch);
624 base_len = newpath.len;
625 while (string_list_has_string(&o->current_file_set, newpath.buf) ||
626 string_list_has_string(&o->current_directory_set, newpath.buf) ||
627 (!o->call_depth && file_exists(newpath.buf))) {
628 strbuf_setlen(&newpath, base_len);
629 strbuf_addf(&newpath, "_%d", suffix++);
632 string_list_insert(&o->current_file_set, newpath.buf);
633 return strbuf_detach(&newpath, NULL);
636 static int dir_in_way(const char *path, int check_working_copy)
639 struct strbuf dirpath = STRBUF_INIT;
642 strbuf_addstr(&dirpath, path);
643 strbuf_addch(&dirpath, '/');
645 pos = cache_name_pos(dirpath.buf, dirpath.len);
649 if (pos < active_nr &&
650 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
651 strbuf_release(&dirpath);
655 strbuf_release(&dirpath);
656 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
659 static int was_tracked(const char *path)
661 int pos = cache_name_pos(path, strlen(path));
665 while (pos < active_nr &&
666 !strcmp(path, active_cache[pos]->name)) {
668 * If stage #0, it is definitely tracked.
669 * If it has stage #2 then it was tracked
670 * before this merge started. All other
671 * cases the path was not tracked.
673 switch (ce_stage(active_cache[pos])) {
683 static int would_lose_untracked(const char *path)
685 return !was_tracked(path) && file_exists(path);
688 static int make_room_for_path(struct merge_options *o, const char *path)
691 const char *msg = _("failed to create path '%s'%s");
693 /* Unlink any D/F conflict files that are in the way */
694 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
695 const char *df_path = o->df_conflict_file_set.items[i].string;
696 size_t pathlen = strlen(path);
697 size_t df_pathlen = strlen(df_path);
698 if (df_pathlen < pathlen &&
699 path[df_pathlen] == '/' &&
700 strncmp(path, df_path, df_pathlen) == 0) {
702 _("Removing %s to make room for subdirectory\n"),
705 unsorted_string_list_delete_item(&o->df_conflict_file_set,
711 /* Make sure leading directories are created */
712 status = safe_create_leading_directories_const(path);
714 if (status == SCLD_EXISTS) {
715 /* something else exists */
716 error(msg, path, _(": perhaps a D/F conflict?"));
723 * Do not unlink a file in the work tree if we are not
726 if (would_lose_untracked(path))
727 return error(_("refusing to lose untracked file at '%s'"),
730 /* Successful unlink is good.. */
733 /* .. and so is no existing file */
736 /* .. but not some other error (who really cares what?) */
737 return error(msg, path, _(": perhaps a D/F conflict?"));
740 static void update_file_flags(struct merge_options *o,
741 const unsigned char *sha,
751 enum object_type type;
755 if (S_ISGITLINK(mode)) {
757 * We may later decide to recursively descend into
758 * the submodule directory and update its index
759 * and/or work tree, but we do not do that now.
765 buf = read_sha1_file(sha, &type, &size);
767 die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
768 if (type != OBJ_BLOB)
769 die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
771 struct strbuf strbuf = STRBUF_INIT;
772 if (convert_to_working_tree(path, buf, size, &strbuf)) {
775 buf = strbuf_detach(&strbuf, NULL);
779 if (make_room_for_path(o, path) < 0) {
784 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
790 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
792 die_errno(_("failed to open '%s'"), path);
793 write_in_full(fd, buf, size);
795 } else if (S_ISLNK(mode)) {
796 char *lnk = xmemdupz(buf, size);
797 safe_create_leading_directories_const(path);
799 if (symlink(lnk, path))
800 die_errno(_("failed to symlink '%s'"), path);
803 die(_("do not know what to do with %06o %s '%s'"),
804 mode, sha1_to_hex(sha), path);
809 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
812 static void update_file(struct merge_options *o,
814 const unsigned char *sha,
818 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
821 /* Low level file merging, update and removal */
823 struct merge_file_info {
824 unsigned char sha[20];
830 static int merge_3way(struct merge_options *o,
831 mmbuffer_t *result_buf,
832 const struct diff_filespec *one,
833 const struct diff_filespec *a,
834 const struct diff_filespec *b,
838 mmfile_t orig, src1, src2;
839 struct ll_merge_options ll_opts = {0};
840 char *base_name, *name1, *name2;
843 ll_opts.renormalize = o->renormalize;
844 ll_opts.xdl_opts = o->xdl_opts;
847 ll_opts.virtual_ancestor = 1;
850 switch (o->recursive_variant) {
851 case MERGE_RECURSIVE_OURS:
852 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
854 case MERGE_RECURSIVE_THEIRS:
855 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
863 if (strcmp(a->path, b->path) ||
864 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
865 base_name = o->ancestor == NULL ? NULL :
866 mkpathdup("%s:%s", o->ancestor, one->path);
867 name1 = mkpathdup("%s:%s", branch1, a->path);
868 name2 = mkpathdup("%s:%s", branch2, b->path);
870 base_name = o->ancestor == NULL ? NULL :
871 mkpathdup("%s", o->ancestor);
872 name1 = mkpathdup("%s", branch1);
873 name2 = mkpathdup("%s", branch2);
876 read_mmblob(&orig, one->oid.hash);
877 read_mmblob(&src1, a->oid.hash);
878 read_mmblob(&src2, b->oid.hash);
880 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
881 &src1, name1, &src2, name2, &ll_opts);
892 static struct merge_file_info merge_file_1(struct merge_options *o,
893 const struct diff_filespec *one,
894 const struct diff_filespec *a,
895 const struct diff_filespec *b,
899 struct merge_file_info result;
903 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
905 if (S_ISREG(a->mode)) {
906 result.mode = a->mode;
907 hashcpy(result.sha, a->oid.hash);
909 result.mode = b->mode;
910 hashcpy(result.sha, b->oid.hash);
913 if (!sha_eq(a->oid.hash, one->oid.hash) && !sha_eq(b->oid.hash, one->oid.hash))
919 if (a->mode == b->mode || a->mode == one->mode)
920 result.mode = b->mode;
922 result.mode = a->mode;
923 if (b->mode != one->mode) {
929 if (sha_eq(a->oid.hash, b->oid.hash) || sha_eq(a->oid.hash, one->oid.hash))
930 hashcpy(result.sha, b->oid.hash);
931 else if (sha_eq(b->oid.hash, one->oid.hash))
932 hashcpy(result.sha, a->oid.hash);
933 else if (S_ISREG(a->mode)) {
934 mmbuffer_t result_buf;
937 merge_status = merge_3way(o, &result_buf, one, a, b,
940 if ((merge_status < 0) || !result_buf.ptr)
941 die(_("Failed to execute internal merge"));
943 if (write_sha1_file(result_buf.ptr, result_buf.size,
944 blob_type, result.sha))
945 die(_("Unable to add %s to database"),
948 free(result_buf.ptr);
949 result.clean = (merge_status == 0);
950 } else if (S_ISGITLINK(a->mode)) {
951 result.clean = merge_submodule(result.sha,
957 } else if (S_ISLNK(a->mode)) {
958 hashcpy(result.sha, a->oid.hash);
960 if (!sha_eq(a->oid.hash, b->oid.hash))
963 die(_("unsupported object type in the tree"));
970 static struct merge_file_info
971 merge_file_special_markers(struct merge_options *o,
972 const struct diff_filespec *one,
973 const struct diff_filespec *a,
974 const struct diff_filespec *b,
976 const char *filename1,
978 const char *filename2)
982 struct merge_file_info mfi;
985 side1 = xstrfmt("%s:%s", branch1, filename1);
987 side2 = xstrfmt("%s:%s", branch2, filename2);
989 mfi = merge_file_1(o, one, a, b,
990 side1 ? side1 : branch1, side2 ? side2 : branch2);
996 static struct merge_file_info merge_file_one(struct merge_options *o,
998 const unsigned char *o_sha, int o_mode,
999 const unsigned char *a_sha, int a_mode,
1000 const unsigned char *b_sha, int b_mode,
1001 const char *branch1,
1002 const char *branch2)
1004 struct diff_filespec one, a, b;
1006 one.path = a.path = b.path = (char *)path;
1007 hashcpy(one.oid.hash, o_sha);
1009 hashcpy(a.oid.hash, a_sha);
1011 hashcpy(b.oid.hash, b_sha);
1013 return merge_file_1(o, &one, &a, &b, branch1, branch2);
1016 static void handle_change_delete(struct merge_options *o,
1018 const unsigned char *o_sha, int o_mode,
1019 const unsigned char *a_sha, int a_mode,
1020 const unsigned char *b_sha, int b_mode,
1021 const char *change, const char *change_past)
1023 char *renamed = NULL;
1024 if (dir_in_way(path, !o->call_depth)) {
1025 renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1028 if (o->call_depth) {
1030 * We cannot arbitrarily accept either a_sha or b_sha as
1031 * correct; since there is no true "middle point" between
1032 * them, simply reuse the base version for virtual merge base.
1034 remove_file_from_cache(path);
1035 update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
1036 } else if (!a_sha) {
1038 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1039 "and %s in %s. Version %s of %s left in tree."),
1040 change, path, o->branch1, change_past,
1041 o->branch2, o->branch2, path);
1042 update_file(o, 0, b_sha, b_mode, path);
1044 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1045 "and %s in %s. Version %s of %s left in tree at %s."),
1046 change, path, o->branch1, change_past,
1047 o->branch2, o->branch2, path, renamed);
1048 update_file(o, 0, b_sha, b_mode, renamed);
1052 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1053 "and %s in %s. Version %s of %s left in tree."),
1054 change, path, o->branch2, change_past,
1055 o->branch1, o->branch1, path);
1057 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1058 "and %s in %s. Version %s of %s left in tree at %s."),
1059 change, path, o->branch2, change_past,
1060 o->branch1, o->branch1, path, renamed);
1061 update_file(o, 0, a_sha, a_mode, renamed);
1064 * No need to call update_file() on path when !renamed, since
1065 * that would needlessly touch path. We could call
1066 * update_file_flags() with update_cache=0 and update_wd=0,
1067 * but that's a no-op.
1073 static void conflict_rename_delete(struct merge_options *o,
1074 struct diff_filepair *pair,
1075 const char *rename_branch,
1076 const char *other_branch)
1078 const struct diff_filespec *orig = pair->one;
1079 const struct diff_filespec *dest = pair->two;
1080 const unsigned char *a_sha = NULL;
1081 const unsigned char *b_sha = NULL;
1085 if (rename_branch == o->branch1) {
1086 a_sha = dest->oid.hash;
1087 a_mode = dest->mode;
1089 b_sha = dest->oid.hash;
1090 b_mode = dest->mode;
1093 handle_change_delete(o,
1094 o->call_depth ? orig->path : dest->path,
1095 orig->oid.hash, orig->mode,
1098 _("rename"), _("renamed"));
1100 if (o->call_depth) {
1101 remove_file_from_cache(dest->path);
1103 update_stages(dest->path, NULL,
1104 rename_branch == o->branch1 ? dest : NULL,
1105 rename_branch == o->branch1 ? NULL : dest);
1110 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1111 struct stage_data *entry,
1114 unsigned char *sha = entry->stages[stage].sha;
1115 unsigned mode = entry->stages[stage].mode;
1116 if (mode == 0 || is_null_sha1(sha))
1118 hashcpy(target->oid.hash, sha);
1119 target->mode = mode;
1123 static void handle_file(struct merge_options *o,
1124 struct diff_filespec *rename,
1126 struct rename_conflict_info *ci)
1128 char *dst_name = rename->path;
1129 struct stage_data *dst_entry;
1130 const char *cur_branch, *other_branch;
1131 struct diff_filespec other;
1132 struct diff_filespec *add;
1135 dst_entry = ci->dst_entry1;
1136 cur_branch = ci->branch1;
1137 other_branch = ci->branch2;
1139 dst_entry = ci->dst_entry2;
1140 cur_branch = ci->branch2;
1141 other_branch = ci->branch1;
1144 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
1146 char *add_name = unique_path(o, rename->path, other_branch);
1147 update_file(o, 0, add->oid.hash, add->mode, add_name);
1149 remove_file(o, 0, rename->path, 0);
1150 dst_name = unique_path(o, rename->path, cur_branch);
1152 if (dir_in_way(rename->path, !o->call_depth)) {
1153 dst_name = unique_path(o, rename->path, cur_branch);
1154 output(o, 1, _("%s is a directory in %s adding as %s instead"),
1155 rename->path, other_branch, dst_name);
1158 update_file(o, 0, rename->oid.hash, rename->mode, dst_name);
1160 update_stages(rename->path, NULL, rename, add);
1162 update_stages(rename->path, NULL, add, rename);
1164 if (dst_name != rename->path)
1168 static void conflict_rename_rename_1to2(struct merge_options *o,
1169 struct rename_conflict_info *ci)
1171 /* One file was renamed in both branches, but to different names. */
1172 struct diff_filespec *one = ci->pair1->one;
1173 struct diff_filespec *a = ci->pair1->two;
1174 struct diff_filespec *b = ci->pair2->two;
1176 output(o, 1, _("CONFLICT (rename/rename): "
1177 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1178 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1179 one->path, a->path, ci->branch1,
1180 one->path, b->path, ci->branch2,
1181 o->call_depth ? _(" (left unresolved)") : "");
1182 if (o->call_depth) {
1183 struct merge_file_info mfi;
1184 struct diff_filespec other;
1185 struct diff_filespec *add;
1186 mfi = merge_file_one(o, one->path,
1187 one->oid.hash, one->mode,
1188 a->oid.hash, a->mode,
1189 b->oid.hash, b->mode,
1190 ci->branch1, ci->branch2);
1192 * FIXME: For rename/add-source conflicts (if we could detect
1193 * such), this is wrong. We should instead find a unique
1194 * pathname and then either rename the add-source file to that
1195 * unique path, or use that unique path instead of src here.
1197 update_file(o, 0, mfi.sha, mfi.mode, one->path);
1200 * Above, we put the merged content at the merge-base's
1201 * path. Now we usually need to delete both a->path and
1202 * b->path. However, the rename on each side of the merge
1203 * could also be involved in a rename/add conflict. In
1204 * such cases, we should keep the added file around,
1205 * resolving the conflict at that path in its favor.
1207 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1209 update_file(o, 0, add->oid.hash, add->mode, a->path);
1211 remove_file_from_cache(a->path);
1212 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1214 update_file(o, 0, add->oid.hash, add->mode, b->path);
1216 remove_file_from_cache(b->path);
1218 handle_file(o, a, 2, ci);
1219 handle_file(o, b, 3, ci);
1223 static void conflict_rename_rename_2to1(struct merge_options *o,
1224 struct rename_conflict_info *ci)
1226 /* Two files, a & b, were renamed to the same thing, c. */
1227 struct diff_filespec *a = ci->pair1->one;
1228 struct diff_filespec *b = ci->pair2->one;
1229 struct diff_filespec *c1 = ci->pair1->two;
1230 struct diff_filespec *c2 = ci->pair2->two;
1231 char *path = c1->path; /* == c2->path */
1232 struct merge_file_info mfi_c1;
1233 struct merge_file_info mfi_c2;
1235 output(o, 1, _("CONFLICT (rename/rename): "
1236 "Rename %s->%s in %s. "
1237 "Rename %s->%s in %s"),
1238 a->path, c1->path, ci->branch1,
1239 b->path, c2->path, ci->branch2);
1241 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1242 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
1244 mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
1245 o->branch1, c1->path,
1246 o->branch2, ci->ren1_other.path);
1247 mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
1248 o->branch1, ci->ren2_other.path,
1249 o->branch2, c2->path);
1251 if (o->call_depth) {
1253 * If mfi_c1.clean && mfi_c2.clean, then it might make
1254 * sense to do a two-way merge of those results. But, I
1255 * think in all cases, it makes sense to have the virtual
1256 * merge base just undo the renames; they can be detected
1257 * again later for the non-recursive merge.
1259 remove_file(o, 0, path, 0);
1260 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
1261 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
1263 char *new_path1 = unique_path(o, path, ci->branch1);
1264 char *new_path2 = unique_path(o, path, ci->branch2);
1265 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
1266 a->path, new_path1, b->path, new_path2);
1267 remove_file(o, 0, path, 0);
1268 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
1269 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
1275 static int process_renames(struct merge_options *o,
1276 struct string_list *a_renames,
1277 struct string_list *b_renames)
1279 int clean_merge = 1, i, j;
1280 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1281 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
1282 const struct rename *sre;
1284 for (i = 0; i < a_renames->nr; i++) {
1285 sre = a_renames->items[i].util;
1286 string_list_insert(&a_by_dst, sre->pair->two->path)->util
1289 for (i = 0; i < b_renames->nr; i++) {
1290 sre = b_renames->items[i].util;
1291 string_list_insert(&b_by_dst, sre->pair->two->path)->util
1295 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1296 struct string_list *renames1, *renames2Dst;
1297 struct rename *ren1 = NULL, *ren2 = NULL;
1298 const char *branch1, *branch2;
1299 const char *ren1_src, *ren1_dst;
1300 struct string_list_item *lookup;
1302 if (i >= a_renames->nr) {
1303 ren2 = b_renames->items[j++].util;
1304 } else if (j >= b_renames->nr) {
1305 ren1 = a_renames->items[i++].util;
1307 int compare = strcmp(a_renames->items[i].string,
1308 b_renames->items[j].string);
1310 ren1 = a_renames->items[i++].util;
1312 ren2 = b_renames->items[j++].util;
1315 /* TODO: refactor, so that 1/2 are not needed */
1317 renames1 = a_renames;
1318 renames2Dst = &b_by_dst;
1319 branch1 = o->branch1;
1320 branch2 = o->branch2;
1323 renames1 = b_renames;
1324 renames2Dst = &a_by_dst;
1325 branch1 = o->branch2;
1326 branch2 = o->branch1;
1332 if (ren1->processed)
1334 ren1->processed = 1;
1335 ren1->dst_entry->processed = 1;
1336 /* BUG: We should only mark src_entry as processed if we
1337 * are not dealing with a rename + add-source case.
1339 ren1->src_entry->processed = 1;
1341 ren1_src = ren1->pair->one->path;
1342 ren1_dst = ren1->pair->two->path;
1345 /* One file renamed on both sides */
1346 const char *ren2_src = ren2->pair->one->path;
1347 const char *ren2_dst = ren2->pair->two->path;
1348 enum rename_type rename_type;
1349 if (strcmp(ren1_src, ren2_src) != 0)
1350 die("ren1_src != ren2_src");
1351 ren2->dst_entry->processed = 1;
1352 ren2->processed = 1;
1353 if (strcmp(ren1_dst, ren2_dst) != 0) {
1354 rename_type = RENAME_ONE_FILE_TO_TWO;
1357 rename_type = RENAME_ONE_FILE_TO_ONE;
1358 /* BUG: We should only remove ren1_src in
1359 * the base stage (think of rename +
1360 * add-source cases).
1362 remove_file(o, 1, ren1_src, 1);
1363 update_entry(ren1->dst_entry,
1368 setup_rename_conflict_info(rename_type,
1378 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1379 /* Two different files renamed to the same thing */
1381 ren2 = lookup->util;
1382 ren2_dst = ren2->pair->two->path;
1383 if (strcmp(ren1_dst, ren2_dst) != 0)
1384 die("ren1_dst != ren2_dst");
1387 ren2->processed = 1;
1389 * BUG: We should only mark src_entry as processed
1390 * if we are not dealing with a rename + add-source
1393 ren2->src_entry->processed = 1;
1395 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1407 /* Renamed in 1, maybe changed in 2 */
1408 /* we only use sha1 and mode of these */
1409 struct diff_filespec src_other, dst_other;
1413 * unpack_trees loads entries from common-commit
1414 * into stage 1, from head-commit into stage 2, and
1415 * from merge-commit into stage 3. We keep track
1416 * of which side corresponds to the rename.
1418 int renamed_stage = a_renames == renames1 ? 2 : 3;
1419 int other_stage = a_renames == renames1 ? 3 : 2;
1421 /* BUG: We should only remove ren1_src in the base
1422 * stage and in other_stage (think of rename +
1425 remove_file(o, 1, ren1_src,
1426 renamed_stage == 2 || !was_tracked(ren1_src));
1428 hashcpy(src_other.oid.hash,
1429 ren1->src_entry->stages[other_stage].sha);
1430 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1431 hashcpy(dst_other.oid.hash,
1432 ren1->dst_entry->stages[other_stage].sha);
1433 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1436 if (sha_eq(src_other.oid.hash, null_sha1)) {
1437 setup_rename_conflict_info(RENAME_DELETE,
1447 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1448 sha_eq(dst_other.oid.hash, ren1->pair->two->oid.hash)) {
1450 * Added file on the other side identical to
1451 * the file being renamed: clean merge.
1452 * Also, there is no need to overwrite the
1453 * file already in the working copy, so call
1454 * update_file_flags() instead of
1457 update_file_flags(o,
1458 ren1->pair->two->oid.hash,
1459 ren1->pair->two->mode,
1461 1, /* update_cache */
1463 } else if (!sha_eq(dst_other.oid.hash, null_sha1)) {
1466 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1468 ren1_src, ren1_dst, branch1,
1470 if (o->call_depth) {
1471 struct merge_file_info mfi;
1472 mfi = merge_file_one(o, ren1_dst, null_sha1, 0,
1473 ren1->pair->two->oid.hash,
1474 ren1->pair->two->mode,
1478 output(o, 1, _("Adding merged %s"), ren1_dst);
1479 update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
1482 char *new_path = unique_path(o, ren1_dst, branch2);
1483 output(o, 1, _("Adding as %s instead"), new_path);
1484 update_file(o, 0, dst_other.oid.hash,
1485 dst_other.mode, new_path);
1492 struct diff_filespec *one, *a, *b;
1493 src_other.path = (char *)ren1_src;
1495 one = ren1->pair->one;
1496 if (a_renames == renames1) {
1497 a = ren1->pair->two;
1500 b = ren1->pair->two;
1503 update_entry(ren1->dst_entry, one, a, b);
1504 setup_rename_conflict_info(RENAME_NORMAL,
1517 string_list_clear(&a_by_dst, 0);
1518 string_list_clear(&b_by_dst, 0);
1523 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1525 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1528 static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1531 enum object_type type;
1533 buf = read_sha1_file(sha1, &type, &size);
1535 return error(_("cannot read object %s"), sha1_to_hex(sha1));
1536 if (type != OBJ_BLOB) {
1538 return error(_("object %s is not a blob"), sha1_to_hex(sha1));
1540 strbuf_attach(dst, buf, size, size + 1);
1544 static int blob_unchanged(const unsigned char *o_sha,
1546 const unsigned char *a_sha,
1548 int renormalize, const char *path)
1550 struct strbuf o = STRBUF_INIT;
1551 struct strbuf a = STRBUF_INIT;
1552 int ret = 0; /* assume changed for safety */
1554 if (a_mode != o_mode)
1556 if (sha_eq(o_sha, a_sha))
1561 assert(o_sha && a_sha);
1562 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1565 * Note: binary | is used so that both renormalizations are
1566 * performed. Comparison can be skipped if both files are
1567 * unchanged since their sha1s have already been compared.
1569 if (renormalize_buffer(path, o.buf, o.len, &o) |
1570 renormalize_buffer(path, a.buf, a.len, &a))
1571 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1579 static void handle_modify_delete(struct merge_options *o,
1581 unsigned char *o_sha, int o_mode,
1582 unsigned char *a_sha, int a_mode,
1583 unsigned char *b_sha, int b_mode)
1585 handle_change_delete(o,
1590 _("modify"), _("modified"));
1593 static int merge_content(struct merge_options *o,
1595 unsigned char *o_sha, int o_mode,
1596 unsigned char *a_sha, int a_mode,
1597 unsigned char *b_sha, int b_mode,
1598 struct rename_conflict_info *rename_conflict_info)
1600 const char *reason = _("content");
1601 const char *path1 = NULL, *path2 = NULL;
1602 struct merge_file_info mfi;
1603 struct diff_filespec one, a, b;
1604 unsigned df_conflict_remains = 0;
1607 reason = _("add/add");
1608 o_sha = (unsigned char *)null_sha1;
1610 one.path = a.path = b.path = (char *)path;
1611 hashcpy(one.oid.hash, o_sha);
1613 hashcpy(a.oid.hash, a_sha);
1615 hashcpy(b.oid.hash, b_sha);
1618 if (rename_conflict_info) {
1619 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1621 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1622 pair1->two->path : pair1->one->path;
1623 /* If rename_conflict_info->pair2 != NULL, we are in
1624 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1627 path2 = (rename_conflict_info->pair2 ||
1628 o->branch2 == rename_conflict_info->branch1) ?
1629 pair1->two->path : pair1->one->path;
1631 if (dir_in_way(path, !o->call_depth))
1632 df_conflict_remains = 1;
1634 mfi = merge_file_special_markers(o, &one, &a, &b,
1638 if (mfi.clean && !df_conflict_remains &&
1639 sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
1640 int path_renamed_outside_HEAD;
1641 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1643 * The content merge resulted in the same file contents we
1644 * already had. We can return early if those file contents
1645 * are recorded at the correct path (which may not be true
1646 * if the merge involves a rename).
1648 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1649 if (!path_renamed_outside_HEAD) {
1650 add_cacheinfo(mfi.mode, mfi.sha, path,
1651 0, (!o->call_depth), 0);
1655 output(o, 2, _("Auto-merging %s"), path);
1658 if (S_ISGITLINK(mfi.mode))
1659 reason = _("submodule");
1660 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
1662 if (rename_conflict_info && !df_conflict_remains)
1663 update_stages(path, &one, &a, &b);
1666 if (df_conflict_remains) {
1668 if (o->call_depth) {
1669 remove_file_from_cache(path);
1672 update_stages(path, &one, &a, &b);
1674 int file_from_stage2 = was_tracked(path);
1675 struct diff_filespec merged;
1676 hashcpy(merged.oid.hash, mfi.sha);
1677 merged.mode = mfi.mode;
1679 update_stages(path, NULL,
1680 file_from_stage2 ? &merged : NULL,
1681 file_from_stage2 ? NULL : &merged);
1685 new_path = unique_path(o, path, rename_conflict_info->branch1);
1686 output(o, 1, _("Adding as %s instead"), new_path);
1687 update_file(o, 0, mfi.sha, mfi.mode, new_path);
1691 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1697 /* Per entry merge function */
1698 static int process_entry(struct merge_options *o,
1699 const char *path, struct stage_data *entry)
1701 int clean_merge = 1;
1702 int normalize = o->renormalize;
1703 unsigned o_mode = entry->stages[1].mode;
1704 unsigned a_mode = entry->stages[2].mode;
1705 unsigned b_mode = entry->stages[3].mode;
1706 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1707 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1708 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1710 entry->processed = 1;
1711 if (entry->rename_conflict_info) {
1712 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
1713 switch (conflict_info->rename_type) {
1715 case RENAME_ONE_FILE_TO_ONE:
1716 clean_merge = merge_content(o, path,
1717 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1722 conflict_rename_delete(o, conflict_info->pair1,
1723 conflict_info->branch1,
1724 conflict_info->branch2);
1726 case RENAME_ONE_FILE_TO_TWO:
1728 conflict_rename_rename_1to2(o, conflict_info);
1730 case RENAME_TWO_FILES_TO_ONE:
1732 conflict_rename_rename_2to1(o, conflict_info);
1735 entry->processed = 0;
1738 } else if (o_sha && (!a_sha || !b_sha)) {
1739 /* Case A: Deleted in one */
1740 if ((!a_sha && !b_sha) ||
1741 (!b_sha && blob_unchanged(o_sha, o_mode, a_sha, a_mode, normalize, path)) ||
1742 (!a_sha && blob_unchanged(o_sha, o_mode, b_sha, b_mode, normalize, path))) {
1743 /* Deleted in both or deleted in one and
1744 * unchanged in the other */
1746 output(o, 2, _("Removing %s"), path);
1747 /* do not touch working file if it did not exist */
1748 remove_file(o, 1, path, !a_sha);
1750 /* Modify/delete; deleted side may have put a directory in the way */
1752 handle_modify_delete(o, path, o_sha, o_mode,
1753 a_sha, a_mode, b_sha, b_mode);
1755 } else if ((!o_sha && a_sha && !b_sha) ||
1756 (!o_sha && !a_sha && b_sha)) {
1757 /* Case B: Added in one. */
1758 /* [nothing|directory] -> ([nothing|directory], file) */
1760 const char *add_branch;
1761 const char *other_branch;
1763 const unsigned char *sha;
1767 add_branch = o->branch1;
1768 other_branch = o->branch2;
1771 conf = _("file/directory");
1773 add_branch = o->branch2;
1774 other_branch = o->branch1;
1777 conf = _("directory/file");
1779 if (dir_in_way(path, !o->call_depth)) {
1780 char *new_path = unique_path(o, path, add_branch);
1782 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1784 conf, path, other_branch, path, new_path);
1785 update_file(o, 0, sha, mode, new_path);
1787 remove_file_from_cache(path);
1790 output(o, 2, _("Adding %s"), path);
1791 /* do not overwrite file if already present */
1792 update_file_flags(o, sha, mode, path, 1, !a_sha);
1794 } else if (a_sha && b_sha) {
1795 /* Case C: Added in both (check for same permissions) and */
1796 /* case D: Modified in both, but differently. */
1797 clean_merge = merge_content(o, path,
1798 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1800 } else if (!o_sha && !a_sha && !b_sha) {
1802 * this entry was deleted altogether. a_mode == 0 means
1803 * we had that path and want to actively remove it.
1805 remove_file(o, 1, path, !a_mode);
1807 die(_("Fatal merge failure, shouldn't happen."));
1812 int merge_trees(struct merge_options *o,
1815 struct tree *common,
1816 struct tree **result)
1820 if (o->subtree_shift) {
1821 merge = shift_tree_object(head, merge, o->subtree_shift);
1822 common = shift_tree_object(head, common, o->subtree_shift);
1825 if (sha_eq(common->object.oid.hash, merge->object.oid.hash)) {
1826 output(o, 0, _("Already up-to-date!"));
1831 code = git_merge_trees(o->call_depth, common, head, merge);
1834 if (show(o, 4) || o->call_depth)
1835 die(_("merging of trees %s and %s failed"),
1836 oid_to_hex(&head->object.oid),
1837 oid_to_hex(&merge->object.oid));
1842 if (unmerged_cache()) {
1843 struct string_list *entries, *re_head, *re_merge;
1845 string_list_clear(&o->current_file_set, 1);
1846 string_list_clear(&o->current_directory_set, 1);
1847 get_files_dirs(o, head);
1848 get_files_dirs(o, merge);
1850 entries = get_unmerged();
1851 record_df_conflict_files(o, entries);
1852 re_head = get_renames(o, head, common, head, merge, entries);
1853 re_merge = get_renames(o, merge, common, head, merge, entries);
1854 clean = process_renames(o, re_head, re_merge);
1855 for (i = entries->nr-1; 0 <= i; i--) {
1856 const char *path = entries->items[i].string;
1857 struct stage_data *e = entries->items[i].util;
1859 && !process_entry(o, path, e))
1862 for (i = 0; i < entries->nr; i++) {
1863 struct stage_data *e = entries->items[i].util;
1865 die(_("Unprocessed path??? %s"),
1866 entries->items[i].string);
1869 string_list_clear(re_merge, 0);
1870 string_list_clear(re_head, 0);
1871 string_list_clear(entries, 1);
1881 *result = write_tree_from_memory(o);
1886 static struct commit_list *reverse_commit_list(struct commit_list *list)
1888 struct commit_list *next = NULL, *current, *backup;
1889 for (current = list; current; current = backup) {
1890 backup = current->next;
1891 current->next = next;
1898 * Merge the commits h1 and h2, return the resulting virtual
1899 * commit object and a flag indicating the cleanness of the merge.
1901 int merge_recursive(struct merge_options *o,
1904 struct commit_list *ca,
1905 struct commit **result)
1907 struct commit_list *iter;
1908 struct commit *merged_common_ancestors;
1909 struct tree *mrtree = mrtree;
1913 output(o, 4, _("Merging:"));
1914 output_commit_title(o, h1);
1915 output_commit_title(o, h2);
1919 ca = get_merge_bases(h1, h2);
1920 ca = reverse_commit_list(ca);
1924 unsigned cnt = commit_list_count(ca);
1926 output(o, 5, Q_("found %u common ancestor:",
1927 "found %u common ancestors:", cnt), cnt);
1928 for (iter = ca; iter; iter = iter->next)
1929 output_commit_title(o, iter->item);
1932 merged_common_ancestors = pop_commit(&ca);
1933 if (merged_common_ancestors == NULL) {
1934 /* if there is no common ancestor, use an empty tree */
1937 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
1938 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1941 for (iter = ca; iter; iter = iter->next) {
1942 const char *saved_b1, *saved_b2;
1945 * When the merge fails, the result contains files
1946 * with conflict markers. The cleanness flag is
1947 * ignored, it was never actually used, as result of
1948 * merge_trees has always overwritten it: the committed
1949 * "conflicts" were already resolved.
1952 saved_b1 = o->branch1;
1953 saved_b2 = o->branch2;
1954 o->branch1 = "Temporary merge branch 1";
1955 o->branch2 = "Temporary merge branch 2";
1956 merge_recursive(o, merged_common_ancestors, iter->item,
1957 NULL, &merged_common_ancestors);
1958 o->branch1 = saved_b1;
1959 o->branch2 = saved_b2;
1962 if (!merged_common_ancestors)
1963 die(_("merge returned no commit"));
1970 o->ancestor = "merged common ancestors";
1971 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1974 if (o->call_depth) {
1975 *result = make_virtual_commit(mrtree, "merged tree");
1976 commit_list_insert(h1, &(*result)->parents);
1977 commit_list_insert(h2, &(*result)->parents->next);
1981 diff_warn_rename_limit("merge.renamelimit",
1982 o->needed_rename_limit, 0);
1986 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1988 struct object *object;
1990 object = deref_tag(parse_object(sha1), name, strlen(name));
1993 if (object->type == OBJ_TREE)
1994 return make_virtual_commit((struct tree*)object, name);
1995 if (object->type != OBJ_COMMIT)
1997 if (parse_commit((struct commit *)object))
1999 return (struct commit *)object;
2002 int merge_recursive_generic(struct merge_options *o,
2003 const unsigned char *head,
2004 const unsigned char *merge,
2006 const unsigned char **base_list,
2007 struct commit **result)
2010 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
2011 struct commit *head_commit = get_ref(head, o->branch1);
2012 struct commit *next_commit = get_ref(merge, o->branch2);
2013 struct commit_list *ca = NULL;
2017 for (i = 0; i < num_base_list; ++i) {
2018 struct commit *base;
2019 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
2020 return error(_("Could not parse object '%s'"),
2021 sha1_to_hex(base_list[i]));
2022 commit_list_insert(base, &ca);
2026 hold_locked_index(lock, 1);
2027 clean = merge_recursive(o, head_commit, next_commit, ca,
2029 if (active_cache_changed &&
2030 write_locked_index(&the_index, lock, COMMIT_LOCK))
2031 return error(_("Unable to write index."));
2033 return clean ? 0 : 1;
2036 static void merge_recursive_config(struct merge_options *o)
2038 git_config_get_int("merge.verbosity", &o->verbosity);
2039 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
2040 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
2041 git_config(git_xmerge_config, NULL);
2044 void init_merge_options(struct merge_options *o)
2046 memset(o, 0, sizeof(struct merge_options));
2048 o->buffer_output = 1;
2049 o->diff_rename_limit = -1;
2050 o->merge_rename_limit = -1;
2052 o->detect_rename = 1;
2053 merge_recursive_config(o);
2054 if (getenv("GIT_MERGE_VERBOSITY"))
2056 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
2057 if (o->verbosity >= 5)
2058 o->buffer_output = 0;
2059 strbuf_init(&o->obuf, 0);
2060 string_list_init(&o->current_file_set, 1);
2061 string_list_init(&o->current_directory_set, 1);
2062 string_list_init(&o->df_conflict_file_set, 1);
2065 int parse_merge_opt(struct merge_options *o, const char *s)
2071 if (!strcmp(s, "ours"))
2072 o->recursive_variant = MERGE_RECURSIVE_OURS;
2073 else if (!strcmp(s, "theirs"))
2074 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2075 else if (!strcmp(s, "subtree"))
2076 o->subtree_shift = "";
2077 else if (skip_prefix(s, "subtree=", &arg))
2078 o->subtree_shift = arg;
2079 else if (!strcmp(s, "patience"))
2080 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2081 else if (!strcmp(s, "histogram"))
2082 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2083 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
2084 long value = parse_algorithm_value(arg);
2087 /* clear out previous settings */
2088 DIFF_XDL_CLR(o, NEED_MINIMAL);
2089 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2090 o->xdl_opts |= value;
2092 else if (!strcmp(s, "ignore-space-change"))
2093 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2094 else if (!strcmp(s, "ignore-all-space"))
2095 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2096 else if (!strcmp(s, "ignore-space-at-eol"))
2097 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2098 else if (!strcmp(s, "renormalize"))
2100 else if (!strcmp(s, "no-renormalize"))
2102 else if (!strcmp(s, "no-renames"))
2103 o->detect_rename = 0;
2104 else if (!strcmp(s, "find-renames")) {
2105 o->detect_rename = 1;
2106 o->rename_score = 0;
2108 else if (skip_prefix(s, "find-renames=", &arg) ||
2109 skip_prefix(s, "rename-threshold=", &arg)) {
2110 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
2112 o->detect_rename = 1;