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 <sys/types.h>
14 #include "cache-tree.h"
17 #include "tree-walk.h"
20 #include "run-command.h"
23 #include "path-list.h"
28 #define debug(...) fprintf(stderr, __VA_ARGS__)
30 #define debug(...) do { ; /* nothing */ } while (0)
35 static void show_ce_entry(const char *tag, struct cache_entry *ce)
38 (ce->ce_flags & htons(CE_VALID))) {
39 static char alttag[4];
40 memcpy(alttag, tag, 3);
42 alttag[0] = tolower(tag[0]);
43 else if (tag[0] == '?')
54 fprintf(stderr,"%s%06o %s %d\t",
57 sha1_to_hex(ce->sha1),
59 write_name_quoted("", 0, ce->name,
64 static void ls_files(void) {
66 for (i = 0; i < active_nr; i++) {
67 struct cache_entry *ce = active_cache[i];
68 show_ce_entry("", ce);
70 fprintf(stderr, "---\n");
71 if (0) ls_files(); /* avoid "unused" warning */
76 * A virtual commit has
77 * - (const char *)commit->util set to the name, and
78 * - *(int *)commit->object.sha1 set to the virtual id.
81 static unsigned commit_list_count(const struct commit_list *l)
84 for (; l; l = l->next )
89 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
91 struct commit *commit = xcalloc(1, sizeof(struct commit));
92 static unsigned virtual_id = 1;
94 commit->util = (void*)comment;
95 *(int*)commit->object.sha1 = virtual_id++;
100 * TODO: we should not have to copy the SHA1s around, but rather reference
101 * them. That way, sha_eq() is just sha1 == sha2.
103 static int sha_eq(const unsigned char *a, const unsigned char *b)
107 return a && b && memcmp(a, b, 20) == 0;
111 * TODO: check if we can just reuse the active_cache structure: it is already
112 * sorted (by name, stage).
113 * Only problem: do not write it when flushing the cache.
120 unsigned char sha[20];
122 unsigned processed:1;
125 static struct path_list current_file_set = {NULL, 0, 0, 1};
126 static struct path_list current_directory_set = {NULL, 0, 0, 1};
128 static int output_indent = 0;
130 static void output(const char *fmt, ...)
134 for (i = output_indent; i--;)
137 vfprintf(stdout, fmt, args);
142 static void output_commit_title(struct commit *commit)
145 for (i = output_indent; i--;)
148 printf("virtual %s\n", (char *)commit->util);
150 printf("%s ", sha1_to_hex(commit->object.sha1));
151 if (parse_commit(commit) != 0)
152 printf("(bad commit)\n");
156 for (s = commit->buffer; *s; s++)
157 if (*s == '\n' && s[1] == '\n') {
161 for (len = 0; s[len] && '\n' != s[len]; len++)
163 printf("%.*s\n", len, s);
168 static const char *original_index_file;
169 static const char *temporary_index_file;
170 static int cache_dirty = 0;
172 static int flush_cache(void)
174 /* flush temporary index */
175 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
176 int fd = hold_lock_file_for_update(lock, getenv("GIT_INDEX_FILE"));
178 die("could not lock %s", temporary_index_file);
179 if (write_cache(fd, active_cache, active_nr) ||
180 close(fd) || commit_lock_file(lock))
181 die ("unable to write %s", getenv("GIT_INDEX_FILE"));
187 static void setup_index(int temp)
189 const char *idx = temp ? temporary_index_file: original_index_file;
191 die("fatal: cache changed flush_cache();");
192 unlink(temporary_index_file);
193 setenv("GIT_INDEX_FILE", idx, 1);
197 static struct cache_entry *make_cache_entry(unsigned int mode,
198 const unsigned char *sha1, const char *path, int stage, int refresh)
201 struct cache_entry *ce;
203 if (!verify_path(path))
207 size = cache_entry_size(len);
208 ce = xcalloc(1, size);
210 memcpy(ce->sha1, sha1, 20);
211 memcpy(ce->name, path, len);
212 ce->ce_flags = create_ce_flags(len, stage);
213 ce->ce_mode = create_ce_mode(mode);
216 return refresh_cache_entry(ce, 0);
221 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
222 const char *path, int stage, int refresh, int options)
224 struct cache_entry *ce;
226 read_cache_from(getenv("GIT_INDEX_FILE"));
228 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
230 return error("cache_addinfo failed: %s", strerror(cache_errno));
231 return add_cache_entry(ce, options);
235 * This is a global variable which is used in a number of places but
236 * only written to in the 'merge' function.
238 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
239 * don't update the working directory.
240 * 0 => Leave unmerged entries in the cache and update
241 * the working directory.
243 static int index_only = 0;
246 * TODO: this can be streamlined by refactoring builtin-read-tree.c
248 static int git_read_tree(const struct tree *tree)
251 fprintf(stderr, "GIT_INDEX_FILE='%s' git-read-tree %s\n",
252 getenv("GIT_INDEX_FILE"),
253 sha1_to_hex(tree->object.sha1));
256 const char *argv[] = { "git-read-tree", NULL, NULL, };
258 die("read-tree with dirty cache");
259 argv[1] = sha1_to_hex(tree->object.sha1);
260 rc = run_command_v(2, argv);
261 return rc < 0 ? -1: rc;
265 * TODO: this can be streamlined by refactoring builtin-read-tree.c
267 static int git_merge_trees(const char *update_arg,
273 fprintf(stderr, "GIT_INDEX_FILE='%s' git-read-tree %s -m %s %s %s\n",
274 getenv("GIT_INDEX_FILE"),
276 sha1_to_hex(common->object.sha1),
277 sha1_to_hex(head->object.sha1),
278 sha1_to_hex(merge->object.sha1));
281 const char *argv[] = {
282 "git-read-tree", NULL, "-m", NULL, NULL, NULL,
287 argv[1] = update_arg;
288 argv[3] = sha1_to_hex(common->object.sha1);
289 argv[4] = sha1_to_hex(head->object.sha1);
290 argv[5] = sha1_to_hex(merge->object.sha1);
291 rc = run_command_v(6, argv);
292 return rc < 0 ? -1: rc;
296 * TODO: this can be streamlined by refactoring builtin-write-tree.c
298 static struct tree *git_write_tree(void)
301 fprintf(stderr, "GIT_INDEX_FILE='%s' git-write-tree\n",
302 getenv("GIT_INDEX_FILE"));
307 unsigned char sha1[20];
312 fp = popen("git-write-tree 2>/dev/null", "r");
313 while ((ch = fgetc(fp)) != EOF)
314 if (i < sizeof(buf)-1 && ch >= '0' && ch <= 'f')
319 if (rc == -1 || WEXITSTATUS(rc))
322 if (get_sha1(buf, sha1) != 0)
324 return lookup_tree(sha1);
327 static int save_files_dirs(const unsigned char *sha1,
328 const char *base, int baselen, const char *path,
329 unsigned int mode, int stage)
331 int len = strlen(path);
332 char *newpath = malloc(baselen + len + 1);
333 memcpy(newpath, base, baselen);
334 memcpy(newpath + baselen, path, len);
335 newpath[baselen + len] = '\0';
338 path_list_insert(newpath, ¤t_directory_set);
340 path_list_insert(newpath, ¤t_file_set);
343 return READ_TREE_RECURSIVE;
346 static int get_files_dirs(struct tree *tree)
349 debug("get_files_dirs ...\n");
350 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0) {
351 debug(" get_files_dirs done (0)\n");
354 n = current_file_set.nr + current_directory_set.nr;
355 debug(" get_files_dirs done (%d)\n", n);
360 * Returns a index_entry instance which doesn't have to correspond to
361 * a real cache entry in Git's index.
363 static struct stage_data *insert_stage_data(const char *path,
364 struct tree *o, struct tree *a, struct tree *b,
365 struct path_list *entries)
367 struct path_list_item *item;
368 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
369 get_tree_entry(o->object.sha1, path,
370 e->stages[1].sha, &e->stages[1].mode);
371 get_tree_entry(a->object.sha1, path,
372 e->stages[2].sha, &e->stages[2].mode);
373 get_tree_entry(b->object.sha1, path,
374 e->stages[3].sha, &e->stages[3].mode);
375 item = path_list_insert(path, entries);
381 * Create a dictionary mapping file names to stage_data objects. The
382 * dictionary contains one entry for every path with a non-zero stage entry.
384 static struct path_list *get_unmerged(void)
386 struct path_list *unmerged = xcalloc(1, sizeof(struct path_list));
389 unmerged->strdup_paths = 1;
391 read_cache_from(getenv("GIT_INDEX_FILE"));
394 for (i = 0; i < active_nr; i++) {
395 struct path_list_item *item;
396 struct stage_data *e;
397 struct cache_entry *ce = active_cache[i];
401 item = path_list_lookup(ce->name, unmerged);
403 item = path_list_insert(ce->name, unmerged);
404 item->util = xcalloc(1, sizeof(struct stage_data));
407 e->stages[ce_stage(ce)].mode = ntohl(ce->ce_mode);
408 memcpy(e->stages[ce_stage(ce)].sha, ce->sha1, 20);
416 struct diff_filepair *pair;
417 struct stage_data *src_entry;
418 struct stage_data *dst_entry;
419 unsigned processed:1;
423 * Get information of all renames which occured between 'o_tree' and
424 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
425 * 'b_tree') to be able to associate the correct cache entries with
426 * the rename information. 'tree' is always equal to either a_tree or b_tree.
428 static struct path_list *get_renames(struct tree *tree,
432 struct path_list *entries)
435 struct path_list *renames;
436 struct diff_options opts;
440 debug("get_renames ...\n");
443 renames = xcalloc(1, sizeof(struct path_list));
446 opts.detect_rename = DIFF_DETECT_RENAME;
447 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
448 if (diff_setup_done(&opts) < 0)
449 die("diff setup failed");
450 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
452 for (i = 0; i < diff_queued_diff.nr; ++i) {
453 struct path_list_item *item;
455 struct diff_filepair *pair = diff_queued_diff.queue[i];
456 if (pair->status != 'R') {
457 diff_free_filepair(pair);
460 re = xmalloc(sizeof(*re));
463 item = path_list_lookup(re->pair->one->path, entries);
465 re->src_entry = insert_stage_data(re->pair->one->path,
466 o_tree, a_tree, b_tree, entries);
468 re->src_entry = item->util;
470 item = path_list_lookup(re->pair->two->path, entries);
472 re->dst_entry = insert_stage_data(re->pair->two->path,
473 o_tree, a_tree, b_tree, entries);
475 re->dst_entry = item->util;
476 item = path_list_insert(pair->one->path, renames);
479 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
480 diff_queued_diff.nr = 0;
483 debug(" get_renames done in %ld\n", time(0)-t);
488 int update_stages(const char *path, struct diff_filespec *o,
489 struct diff_filespec *a, struct diff_filespec *b, int clear)
491 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
493 if (remove_file_from_cache(path))
496 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
499 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
502 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
507 static int remove_path(const char *name)
516 dirs = malloc(len+1);
517 memcpy(dirs, name, len);
519 while ((slash = strrchr(name, '/'))) {
522 if (rmdir(name) != 0)
530 * TODO: once we no longer call external programs, we'd probably be better off
531 * not setting / getting the environment variable GIT_INDEX_FILE all the time.
533 int remove_file(int clean, const char *path)
535 int update_cache = index_only || clean;
536 int update_working_directory = !index_only;
540 read_cache_from(getenv("GIT_INDEX_FILE"));
542 if (remove_file_from_cache(path))
545 if (update_working_directory)
548 if (errno != ENOENT || errno != EISDIR)
555 static char *unique_path(const char *path, const char *branch)
557 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
560 char *p = newpath + strlen(newpath);
561 strcpy(newpath, path);
562 strcat(newpath, "~");
567 while (path_list_has_path(¤t_file_set, newpath) ||
568 path_list_has_path(¤t_directory_set, newpath) ||
569 lstat(newpath, &st) == 0)
570 sprintf(p, "_%d", suffix++);
572 path_list_insert(newpath, ¤t_file_set);
576 static int mkdir_p(const char *path, unsigned long mode)
578 /* path points to cache entries, so strdup before messing with it */
579 char *buf = strdup(path);
580 int result = safe_create_leading_directories(buf);
585 static void flush_buffer(int fd, const char *buf, unsigned long size)
588 long ret = xwrite(fd, buf, size);
593 die("merge-recursive: %s", strerror(errno));
595 die("merge-recursive: disk full?");
602 void update_file_flags(const unsigned char *sha,
616 buf = read_sha1_file(sha, type, &size);
618 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
619 if (strcmp(type, blob_type) != 0)
620 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
624 if (mkdir_p(path, 0777))
625 die("failed to create path %s: %s", path, strerror(errno));
631 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
633 die("failed to open %s: %s", path, strerror(errno));
634 flush_buffer(fd, buf, size);
636 } else if (S_ISLNK(mode)) {
637 char *lnk = malloc(size + 1);
638 memcpy(lnk, buf, size);
644 die("do not know what to do with %06o %s '%s'",
645 mode, sha1_to_hex(sha), path);
648 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
651 void update_file(int clean,
652 const unsigned char *sha,
656 update_file_flags(sha, mode, path, index_only || clean, !index_only);
659 /* Low level file merging, update and removal */
661 struct merge_file_info
663 unsigned char sha[20];
669 static char *git_unpack_file(const unsigned char *sha1, char *path)
676 buf = read_sha1_file(sha1, type, &size);
677 if (!buf || strcmp(type, blob_type))
678 die("unable to read blob object %s", sha1_to_hex(sha1));
680 strcpy(path, ".merge_file_XXXXXX");
683 die("unable to create temp-file");
684 flush_buffer(fd, buf, size);
689 static struct merge_file_info merge_file(struct diff_filespec *o,
690 struct diff_filespec *a, struct diff_filespec *b,
691 const char *branch1Name, const char *branch2Name)
693 struct merge_file_info result;
697 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
699 if (S_ISREG(a->mode)) {
700 result.mode = a->mode;
701 memcpy(result.sha, a->sha1, 20);
703 result.mode = b->mode;
704 memcpy(result.sha, b->sha1, 20);
707 if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
710 result.mode = a->mode == o->mode ? b->mode: a->mode;
712 if (sha_eq(a->sha1, o->sha1))
713 memcpy(result.sha, b->sha1, 20);
714 else if (sha_eq(b->sha1, o->sha1))
715 memcpy(result.sha, a->sha1, 20);
716 else if (S_ISREG(a->mode)) {
722 const char *argv[] = {
723 "merge", "-L", NULL, "-L", NULL, "-L", NULL,
729 git_unpack_file(o->sha1, orig);
730 git_unpack_file(a->sha1, src1);
731 git_unpack_file(b->sha1, src2);
733 argv[2] = la = strdup(mkpath("%s/%s", branch1Name, a->path));
734 argv[6] = lb = strdup(mkpath("%s/%s", branch2Name, b->path));
735 argv[4] = lo = strdup(mkpath("orig/%s", o->path));
738 printf("%s %s %s %s %s %s %s %s %s %s\n",
739 argv[0], argv[1], argv[2], argv[3], argv[4],
740 argv[5], argv[6], argv[7], argv[8], argv[9]);
742 code = run_command_v(10, argv);
747 if (code && code < -256) {
748 die("Failed to execute 'merge'. merge(1) is used as the "
749 "file-level merge tool. Is 'merge' in your path?");
751 fd = open(src1, O_RDONLY);
752 if (fd < 0 || fstat(fd, &st) < 0 ||
753 index_fd(result.sha, fd, &st, 1,
755 die("Unable to add %s to database", src1);
761 result.clean = WEXITSTATUS(code) == 0;
763 if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode)))
764 die("cannot merge modes?");
766 memcpy(result.sha, a->sha1, 20);
768 if (!sha_eq(a->sha1, b->sha1))
776 static void conflict_rename_rename(struct rename *ren1,
783 const char *ren1_dst = ren1->pair->two->path;
784 const char *ren2_dst = ren2->pair->two->path;
785 const char *dst_name1 = ren1_dst;
786 const char *dst_name2 = ren2_dst;
787 if (path_list_has_path(¤t_directory_set, ren1_dst)) {
788 dst_name1 = del[delp++] = unique_path(ren1_dst, branch1);
789 output("%s is a directory in %s adding as %s instead",
790 ren1_dst, branch2, dst_name1);
791 remove_file(0, ren1_dst);
793 if (path_list_has_path(¤t_directory_set, ren2_dst)) {
794 dst_name2 = del[delp++] = unique_path(ren2_dst, branch2);
795 output("%s is a directory in %s adding as %s instead",
796 ren2_dst, branch1, dst_name2);
797 remove_file(0, ren2_dst);
799 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
800 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
805 static void conflict_rename_dir(struct rename *ren1,
808 char *new_path = unique_path(ren1->pair->two->path, branch1);
809 output("Renaming %s to %s instead", ren1->pair->one->path, new_path);
810 remove_file(0, ren1->pair->two->path);
811 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
815 static void conflict_rename_rename_2(struct rename *ren1,
820 char *new_path1 = unique_path(ren1->pair->two->path, branch1);
821 char *new_path2 = unique_path(ren2->pair->two->path, branch2);
822 output("Renaming %s to %s and %s to %s instead",
823 ren1->pair->one->path, new_path1,
824 ren2->pair->one->path, new_path2);
825 remove_file(0, ren1->pair->two->path);
826 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
827 update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
832 /* General TODO: get rid of all the debug messages */
833 static int process_renames(struct path_list *a_renames,
834 struct path_list *b_renames,
835 const char *a_branch,
836 const char *b_branch)
838 int clean_merge = 1, i, j;
839 struct path_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
840 const struct rename *sre;
842 for (i = 0; i < a_renames->nr; i++) {
843 sre = a_renames->items[i].util;
844 path_list_insert(sre->pair->two->path, &a_by_dst)->util
847 for (i = 0; i < b_renames->nr; i++) {
848 sre = b_renames->items[i].util;
849 path_list_insert(sre->pair->two->path, &b_by_dst)->util
853 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
856 struct path_list *renames1, *renames2, *renames2Dst;
857 struct rename *ren1 = NULL, *ren2 = NULL;
858 const char *branch1, *branch2;
859 const char *ren1_src, *ren1_dst;
861 if (i >= a_renames->nr) {
863 ren2 = b_renames->items[j++].util;
864 } else if (j >= b_renames->nr) {
866 ren1 = a_renames->items[i++].util;
868 compare = strcmp(a_renames->items[i].path,
869 b_renames->items[j].path);
870 ren1 = a_renames->items[i++].util;
871 ren2 = b_renames->items[j++].util;
874 /* TODO: refactor, so that 1/2 are not needed */
876 renames1 = a_renames;
877 renames2 = b_renames;
878 renames2Dst = &b_by_dst;
883 renames1 = b_renames;
884 renames2 = a_renames;
885 renames2Dst = &a_by_dst;
892 src = ren1->pair->one->path;
894 ren1->dst_entry->processed = 1;
895 ren1->src_entry->processed = 1;
901 ren1_src = ren1->pair->one->path;
902 ren1_dst = ren1->pair->two->path;
905 const char *ren2_src = ren2->pair->one->path;
906 const char *ren2_dst = ren2->pair->two->path;
907 /* Renamed in 1 and renamed in 2 */
908 if (strcmp(ren1_src, ren2_src) != 0)
909 die("ren1.src != ren2.src");
910 ren2->dst_entry->processed = 1;
912 if (strcmp(ren1_dst, ren2_dst) != 0) {
914 output("CONFLICT (rename/rename): "
915 "Rename %s->%s in branch %s "
916 "rename %s->%s in %s",
917 src, ren1_dst, branch1,
918 src, ren2_dst, branch2);
919 conflict_rename_rename(ren1, branch1, ren2, branch2);
921 struct merge_file_info mfi;
922 remove_file(1, ren1_src);
923 mfi = merge_file(ren1->pair->one,
928 if (mfi.merge || !mfi.clean)
929 output("Renaming %s->%s", src, ren1_dst);
932 output("Auto-merging %s", ren1_dst);
935 output("CONFLICT (content): merge conflict in %s",
940 update_stages(ren1_dst,
946 update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
949 /* Renamed in 1, maybe changed in 2 */
950 struct path_list_item *item;
951 /* we only use sha1 and mode of these */
952 struct diff_filespec src_other, dst_other;
953 int try_merge, stage = a_renames == renames1 ? 3: 2;
955 remove_file(1, ren1_src);
957 memcpy(src_other.sha1,
958 ren1->src_entry->stages[stage].sha, 20);
959 src_other.mode = ren1->src_entry->stages[stage].mode;
960 memcpy(dst_other.sha1,
961 ren1->dst_entry->stages[stage].sha, 20);
962 dst_other.mode = ren1->dst_entry->stages[stage].mode;
966 if (path_list_has_path(¤t_directory_set, ren1_dst)) {
968 output("CONFLICT (rename/directory): Rename %s->%s in %s "
969 " directory %s added in %s",
970 ren1_src, ren1_dst, branch1,
972 conflict_rename_dir(ren1, branch1);
973 } else if (sha_eq(src_other.sha1, null_sha1)) {
975 output("CONFLICT (rename/delete): Rename %s->%s in %s "
977 ren1_src, ren1_dst, branch1,
979 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
980 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
981 const char *new_path;
984 output("CONFLICT (rename/add): Rename %s->%s in %s. "
986 ren1_src, ren1_dst, branch1,
988 new_path = unique_path(ren1_dst, branch2);
989 output("Adding as %s instead", new_path);
990 update_file(0, dst_other.sha1, dst_other.mode, new_path);
991 } else if ((item = path_list_lookup(ren1_dst, renames2Dst))) {
995 output("CONFLICT (rename/rename): Rename %s->%s in %s. "
996 "Rename %s->%s in %s",
997 ren1_src, ren1_dst, branch1,
998 ren2->pair->one->path, ren2->pair->two->path, branch2);
999 conflict_rename_rename_2(ren1, branch1, ren2, branch2);
1004 struct diff_filespec *o, *a, *b;
1005 struct merge_file_info mfi;
1006 src_other.path = (char *)ren1_src;
1008 o = ren1->pair->one;
1009 if (a_renames == renames1) {
1010 a = ren1->pair->two;
1013 b = ren1->pair->two;
1016 mfi = merge_file(o, a, b,
1017 a_branch, b_branch);
1019 if (mfi.merge || !mfi.clean)
1020 output("Renaming %s => %s", ren1_src, ren1_dst);
1022 output("Auto-merging %s", ren1_dst);
1024 output("CONFLICT (rename/modify): Merge conflict in %s",
1029 update_stages(ren1_dst,
1032 update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
1036 path_list_clear(&a_by_dst, 0);
1037 path_list_clear(&b_by_dst, 0);
1044 static unsigned char *has_sha(const unsigned char *sha)
1046 return memcmp(sha, null_sha1, 20) == 0 ? NULL: (unsigned char *)sha;
1049 /* Per entry merge function */
1050 static int process_entry(const char *path, struct stage_data *entry,
1051 const char *branch1Name,
1052 const char *branch2Name)
1055 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1056 print_index_entry("\tpath: ", entry);
1058 int clean_merge = 1;
1059 unsigned char *o_sha = has_sha(entry->stages[1].sha);
1060 unsigned char *a_sha = has_sha(entry->stages[2].sha);
1061 unsigned char *b_sha = has_sha(entry->stages[3].sha);
1062 unsigned o_mode = entry->stages[1].mode;
1063 unsigned a_mode = entry->stages[2].mode;
1064 unsigned b_mode = entry->stages[3].mode;
1066 if (o_sha && (!a_sha || !b_sha)) {
1067 /* Case A: Deleted in one */
1068 if ((!a_sha && !b_sha) ||
1069 (sha_eq(a_sha, o_sha) && !b_sha) ||
1070 (!a_sha && sha_eq(b_sha, o_sha))) {
1071 /* Deleted in both or deleted in one and
1072 * unchanged in the other */
1074 output("Removing %s", path);
1075 remove_file(1, path);
1077 /* Deleted in one and changed in the other */
1080 output("CONFLICT (delete/modify): %s deleted in %s "
1081 "and modified in %s. Version %s of %s left in tree.",
1083 branch2Name, branch2Name, path);
1084 update_file(0, b_sha, b_mode, path);
1086 output("CONFLICT (delete/modify): %s deleted in %s "
1087 "and modified in %s. Version %s of %s left in tree.",
1089 branch1Name, branch1Name, path);
1090 update_file(0, a_sha, a_mode, path);
1094 } else if ((!o_sha && a_sha && !b_sha) ||
1095 (!o_sha && !a_sha && b_sha)) {
1096 /* Case B: Added in one. */
1097 const char *add_branch;
1098 const char *other_branch;
1100 const unsigned char *sha;
1104 add_branch = branch1Name;
1105 other_branch = branch2Name;
1108 conf = "file/directory";
1110 add_branch = branch2Name;
1111 other_branch = branch1Name;
1114 conf = "directory/file";
1116 if (path_list_has_path(¤t_directory_set, path)) {
1117 const char *new_path = unique_path(path, add_branch);
1119 output("CONFLICT (%s): There is a directory with name %s in %s. "
1121 conf, path, other_branch, path, new_path);
1122 remove_file(0, path);
1123 update_file(0, sha, mode, new_path);
1125 output("Adding %s", path);
1126 update_file(1, sha, mode, path);
1128 } else if (!o_sha && a_sha && b_sha) {
1129 /* Case C: Added in both (check for same permissions). */
1130 if (sha_eq(a_sha, b_sha)) {
1131 if (a_mode != b_mode) {
1133 output("CONFLICT: File %s added identically in both branches, "
1134 "but permissions conflict %06o->%06o",
1135 path, a_mode, b_mode);
1136 output("CONFLICT: adding with permission: %06o", a_mode);
1137 update_file(0, a_sha, a_mode, path);
1139 /* This case is handled by git-read-tree */
1140 assert(0 && "This case must be handled by git-read-tree");
1143 const char *new_path1, *new_path2;
1145 new_path1 = unique_path(path, branch1Name);
1146 new_path2 = unique_path(path, branch2Name);
1147 output("CONFLICT (add/add): File %s added non-identically "
1148 "in both branches. Adding as %s and %s instead.",
1149 path, new_path1, new_path2);
1150 remove_file(0, path);
1151 update_file(0, a_sha, a_mode, new_path1);
1152 update_file(0, b_sha, b_mode, new_path2);
1155 } else if (o_sha && a_sha && b_sha) {
1156 /* case D: Modified in both, but differently. */
1157 struct merge_file_info mfi;
1158 struct diff_filespec o, a, b;
1160 output("Auto-merging %s", path);
1161 o.path = a.path = b.path = (char *)path;
1162 memcpy(o.sha1, o_sha, 20);
1164 memcpy(a.sha1, a_sha, 20);
1166 memcpy(b.sha1, b_sha, 20);
1169 mfi = merge_file(&o, &a, &b,
1170 branch1Name, branch2Name);
1173 update_file(1, mfi.sha, mfi.mode, path);
1176 output("CONFLICT (content): Merge conflict in %s", path);
1179 update_file(0, mfi.sha, mfi.mode, path);
1181 update_file_flags(mfi.sha, mfi.mode, path,
1182 0 /* update_cache */, 1 /* update_working_directory */);
1185 die("Fatal merge failure, shouldn't happen.");
1193 static int merge_trees(struct tree *head,
1195 struct tree *common,
1196 const char *branch1Name,
1197 const char *branch2Name,
1198 struct tree **result)
1201 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1202 output("Already uptodate!");
1207 code = git_merge_trees(index_only ? "-i": "-u", common, head, merge);
1210 die("merging of trees %s and %s failed",
1211 sha1_to_hex(head->object.sha1),
1212 sha1_to_hex(merge->object.sha1));
1214 *result = git_write_tree();
1217 struct path_list *entries, *re_head, *re_merge;
1219 path_list_clear(¤t_file_set, 1);
1220 path_list_clear(¤t_directory_set, 1);
1221 get_files_dirs(head);
1222 get_files_dirs(merge);
1224 entries = get_unmerged();
1225 re_head = get_renames(head, common, head, merge, entries);
1226 re_merge = get_renames(merge, common, head, merge, entries);
1227 clean = process_renames(re_head, re_merge,
1228 branch1Name, branch2Name);
1229 for (i = 0; i < entries->nr; i++) {
1230 const char *path = entries->items[i].path;
1231 struct stage_data *e = entries->items[i].util;
1234 if (!process_entry(path, e, branch1Name, branch2Name))
1238 path_list_clear(re_merge, 0);
1239 path_list_clear(re_head, 0);
1240 path_list_clear(entries, 1);
1242 if (clean || index_only)
1243 *result = git_write_tree();
1248 printf("merging of trees %s and %s resulted in %s\n",
1249 sha1_to_hex(head->object.sha1),
1250 sha1_to_hex(merge->object.sha1),
1251 sha1_to_hex((*result)->object.sha1));
1258 * Merge the commits h1 and h2, return the resulting virtual
1259 * commit object and a flag indicating the cleaness of the merge.
1262 int merge(struct commit *h1,
1264 const char *branch1Name,
1265 const char *branch2Name,
1266 int call_depth /* =0 */,
1267 struct commit *ancestor /* =None */,
1268 struct commit **result)
1270 struct commit_list *ca = NULL, *iter;
1271 struct commit *merged_common_ancestors;
1272 struct tree *mrtree;
1276 output_commit_title(h1);
1277 output_commit_title(h2);
1280 commit_list_insert(ancestor, &ca);
1282 ca = get_merge_bases(h1, h2, 1);
1284 output("found %u common ancestor(s):", commit_list_count(ca));
1285 for (iter = ca; iter; iter = iter->next)
1286 output_commit_title(iter->item);
1288 merged_common_ancestors = pop_commit(&ca);
1290 for (iter = ca; iter; iter = iter->next) {
1291 output_indent = call_depth + 1;
1293 * When the merge fails, the result contains files
1294 * with conflict markers. The cleanness flag is
1295 * ignored, it was never acutally used, as result of
1296 * merge_trees has always overwritten it: the commited
1297 * "conflicts" were already resolved.
1299 merge(merged_common_ancestors, iter->item,
1300 "Temporary merge branch 1",
1301 "Temporary merge branch 2",
1304 &merged_common_ancestors);
1305 output_indent = call_depth;
1307 if (!merged_common_ancestors)
1308 die("merge returned no commit");
1311 if (call_depth == 0) {
1312 setup_index(0 /* $GIT_DIR/index */);
1315 setup_index(1 /* temporary index */);
1316 git_read_tree(h1->tree);
1320 clean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree,
1321 branch1Name, branch2Name, &mrtree);
1323 if (!ancestor && (clean || index_only)) {
1324 *result = make_virtual_commit(mrtree, "merged tree");
1325 commit_list_insert(h1, &(*result)->parents);
1326 commit_list_insert(h2, &(*result)->parents->next);
1333 static struct commit *get_ref(const char *ref)
1335 unsigned char sha1[20];
1336 struct object *object;
1338 if (get_sha1(ref, sha1))
1339 die("Could not resolve ref '%s'", ref);
1340 object = deref_tag(parse_object(sha1), ref, strlen(ref));
1341 if (object->type != OBJ_COMMIT)
1343 if (parse_commit((struct commit *)object))
1344 die("Could not parse commit '%s'", sha1_to_hex(object->sha1));
1345 return (struct commit *)object;
1348 int main(int argc, char *argv[])
1350 static const char *bases[2];
1351 static unsigned bases_count = 0;
1353 const char *branch1, *branch2;
1354 struct commit *result, *h1, *h2;
1356 original_index_file = getenv("GIT_INDEX_FILE");
1358 if (!original_index_file)
1359 original_index_file = strdup(git_path("index"));
1361 temporary_index_file = strdup(git_path("mrg-rcrsv-tmp-idx"));
1364 die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]);
1366 for (i = 1; i < argc; ++i) {
1367 if (!strcmp(argv[i], "--"))
1369 if (bases_count < sizeof(bases)/sizeof(*bases))
1370 bases[bases_count++] = argv[i];
1372 if (argc - i != 3) /* "--" "<head>" "<remote>" */
1373 die("Not handling anything other than two heads merge.");
1375 branch1 = argv[++i];
1376 branch2 = argv[++i];
1377 printf("Merging %s with %s\n", branch1, branch2);
1379 h1 = get_ref(branch1);
1380 h2 = get_ref(branch2);
1382 if (bases_count == 1) {
1383 struct commit *ancestor = get_ref(bases[0]);
1384 clean = merge(h1, h2, branch1, branch2, 0, ancestor, &result);
1386 clean = merge(h1, h2, branch1, branch2, 0, NULL, &result);
1391 return clean ? 0: 1;