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"
22 #include "unpack-trees.h"
23 #include "path-list.h"
26 * A virtual commit has
27 * - (const char *)commit->util set to the name, and
28 * - *(int *)commit->object.sha1 set to the virtual id.
31 static unsigned commit_list_count(const struct commit_list
*l
)
34 for (; l
; l
= l
->next
)
39 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
41 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
42 static unsigned virtual_id
= 1;
44 commit
->util
= (void*)comment
;
45 *(int*)commit
->object
.sha1
= virtual_id
++;
47 commit
->object
.parsed
= 1;
52 * Since we use get_tree_entry(), which does not put the read object into
53 * the object pool, we cannot rely on a == b.
55 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
59 return a
&& b
&& memcmp(a
, b
, 20) == 0;
63 * Since we want to write the index eventually, we cannot reuse the index
64 * for these (temporary) data.
71 unsigned char sha
[20];
76 static struct path_list current_file_set
= {NULL
, 0, 0, 1};
77 static struct path_list current_directory_set
= {NULL
, 0, 0, 1};
79 static int output_indent
= 0;
81 static void output(const char *fmt
, ...)
85 for (i
= output_indent
; i
--;)
88 vfprintf(stdout
, fmt
, args
);
93 static void output_commit_title(struct commit
*commit
)
96 for (i
= output_indent
; i
--;)
99 printf("virtual %s\n", (char *)commit
->util
);
101 printf("%s ", sha1_to_hex(commit
->object
.sha1
));
102 if (parse_commit(commit
) != 0)
103 printf("(bad commit)\n");
107 for (s
= commit
->buffer
; *s
; s
++)
108 if (*s
== '\n' && s
[1] == '\n') {
112 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
114 printf("%.*s\n", len
, s
);
119 static const char *original_index_file
;
120 static const char *temporary_index_file
;
121 static int cache_dirty
= 0;
123 static int flush_cache(void)
125 /* flush temporary index */
126 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
127 int fd
= hold_lock_file_for_update(lock
, getenv("GIT_INDEX_FILE"));
129 die("could not lock %s", lock
->filename
);
130 if (write_cache(fd
, active_cache
, active_nr
) ||
131 close(fd
) || commit_lock_file(lock
))
132 die ("unable to write %s", getenv("GIT_INDEX_FILE"));
138 static void setup_index(int temp
)
140 const char *idx
= temp
? temporary_index_file
: original_index_file
;
142 die("fatal: cache changed flush_cache();");
143 unlink(temporary_index_file
);
144 setenv("GIT_INDEX_FILE", idx
, 1);
148 static struct cache_entry
*make_cache_entry(unsigned int mode
,
149 const unsigned char *sha1
, const char *path
, int stage
, int refresh
)
152 struct cache_entry
*ce
;
154 if (!verify_path(path
))
158 size
= cache_entry_size(len
);
159 ce
= xcalloc(1, size
);
161 memcpy(ce
->sha1
, sha1
, 20);
162 memcpy(ce
->name
, path
, len
);
163 ce
->ce_flags
= create_ce_flags(len
, stage
);
164 ce
->ce_mode
= create_ce_mode(mode
);
167 return refresh_cache_entry(ce
, 0);
172 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
173 const char *path
, int stage
, int refresh
, int options
)
175 struct cache_entry
*ce
;
177 read_cache_from(getenv("GIT_INDEX_FILE"));
179 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
181 return error("cache_addinfo failed: %s", strerror(cache_errno
));
182 return add_cache_entry(ce
, options
);
186 * This is a global variable which is used in a number of places but
187 * only written to in the 'merge' function.
189 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
190 * don't update the working directory.
191 * 0 => Leave unmerged entries in the cache and update
192 * the working directory.
194 static int index_only
= 0;
196 static int git_read_tree(struct tree
*tree
)
199 struct object_list
*trees
= NULL
;
200 struct unpack_trees_options opts
;
203 die("read-tree with dirty cache");
205 memset(&opts
, 0, sizeof(opts
));
206 object_list_append(&tree
->object
, &trees
);
207 rc
= unpack_trees(trees
, &opts
);
208 cache_tree_free(&active_cache_tree
);
216 static int git_merge_trees(int index_only
,
222 struct object_list
*trees
= NULL
;
223 struct unpack_trees_options opts
;
226 read_cache_from(getenv("GIT_INDEX_FILE"));
230 memset(&opts
, 0, sizeof(opts
));
237 opts
.fn
= threeway_merge
;
239 object_list_append(&common
->object
, &trees
);
240 object_list_append(&head
->object
, &trees
);
241 object_list_append(&merge
->object
, &trees
);
243 rc
= unpack_trees(trees
, &opts
);
244 cache_tree_free(&active_cache_tree
);
252 * TODO: this can be streamlined by refactoring builtin-write-tree.c
254 static struct tree
*git_write_tree(void)
259 unsigned char sha1
[20];
263 for (i
= 0; i
< active_nr
; i
++) {
264 struct cache_entry
*ce
= active_cache
[i
];
270 fp
= popen("git-write-tree 2>/dev/null", "r");
271 while ((ch
= fgetc(fp
)) != EOF
)
272 if (i
< sizeof(buf
)-1 && ch
>= '0' && ch
<= 'f')
277 if (rc
== -1 || WEXITSTATUS(rc
))
280 if (get_sha1(buf
, sha1
) != 0)
282 return lookup_tree(sha1
);
285 static int save_files_dirs(const unsigned char *sha1
,
286 const char *base
, int baselen
, const char *path
,
287 unsigned int mode
, int stage
)
289 int len
= strlen(path
);
290 char *newpath
= malloc(baselen
+ len
+ 1);
291 memcpy(newpath
, base
, baselen
);
292 memcpy(newpath
+ baselen
, path
, len
);
293 newpath
[baselen
+ len
] = '\0';
296 path_list_insert(newpath
, ¤t_directory_set
);
298 path_list_insert(newpath
, ¤t_file_set
);
301 return READ_TREE_RECURSIVE
;
304 static int get_files_dirs(struct tree
*tree
)
307 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
) != 0)
309 n
= current_file_set
.nr
+ current_directory_set
.nr
;
314 * Returns a index_entry instance which doesn't have to correspond to
315 * a real cache entry in Git's index.
317 static struct stage_data
*insert_stage_data(const char *path
,
318 struct tree
*o
, struct tree
*a
, struct tree
*b
,
319 struct path_list
*entries
)
321 struct path_list_item
*item
;
322 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
323 get_tree_entry(o
->object
.sha1
, path
,
324 e
->stages
[1].sha
, &e
->stages
[1].mode
);
325 get_tree_entry(a
->object
.sha1
, path
,
326 e
->stages
[2].sha
, &e
->stages
[2].mode
);
327 get_tree_entry(b
->object
.sha1
, path
,
328 e
->stages
[3].sha
, &e
->stages
[3].mode
);
329 item
= path_list_insert(path
, entries
);
335 * Create a dictionary mapping file names to stage_data objects. The
336 * dictionary contains one entry for every path with a non-zero stage entry.
338 static struct path_list
*get_unmerged(void)
340 struct path_list
*unmerged
= xcalloc(1, sizeof(struct path_list
));
343 unmerged
->strdup_paths
= 1;
345 read_cache_from(getenv("GIT_INDEX_FILE"));
348 for (i
= 0; i
< active_nr
; i
++) {
349 struct path_list_item
*item
;
350 struct stage_data
*e
;
351 struct cache_entry
*ce
= active_cache
[i
];
355 item
= path_list_lookup(ce
->name
, unmerged
);
357 item
= path_list_insert(ce
->name
, unmerged
);
358 item
->util
= xcalloc(1, sizeof(struct stage_data
));
361 e
->stages
[ce_stage(ce
)].mode
= ntohl(ce
->ce_mode
);
362 memcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
, 20);
370 struct diff_filepair
*pair
;
371 struct stage_data
*src_entry
;
372 struct stage_data
*dst_entry
;
373 unsigned processed
:1;
377 * Get information of all renames which occured between 'o_tree' and
378 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
379 * 'b_tree') to be able to associate the correct cache entries with
380 * the rename information. 'tree' is always equal to either a_tree or b_tree.
382 static struct path_list
*get_renames(struct tree
*tree
,
386 struct path_list
*entries
)
389 struct path_list
*renames
;
390 struct diff_options opts
;
392 renames
= xcalloc(1, sizeof(struct path_list
));
395 opts
.detect_rename
= DIFF_DETECT_RENAME
;
396 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
397 if (diff_setup_done(&opts
) < 0)
398 die("diff setup failed");
399 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
401 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
402 struct path_list_item
*item
;
404 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
405 if (pair
->status
!= 'R') {
406 diff_free_filepair(pair
);
409 re
= xmalloc(sizeof(*re
));
412 item
= path_list_lookup(re
->pair
->one
->path
, entries
);
414 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
415 o_tree
, a_tree
, b_tree
, entries
);
417 re
->src_entry
= item
->util
;
419 item
= path_list_lookup(re
->pair
->two
->path
, entries
);
421 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
422 o_tree
, a_tree
, b_tree
, entries
);
424 re
->dst_entry
= item
->util
;
425 item
= path_list_insert(pair
->one
->path
, renames
);
428 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
429 diff_queued_diff
.nr
= 0;
434 int update_stages(const char *path
, struct diff_filespec
*o
,
435 struct diff_filespec
*a
, struct diff_filespec
*b
, int clear
)
437 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
439 if (remove_file_from_cache(path
))
442 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
445 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
448 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
453 static int remove_path(const char *name
)
462 dirs
= malloc(len
+1);
463 memcpy(dirs
, name
, len
);
465 while ((slash
= strrchr(name
, '/'))) {
468 if (rmdir(name
) != 0)
476 * TODO: once we no longer call external programs, we'd probably be better off
477 * not setting / getting the environment variable GIT_INDEX_FILE all the time.
479 int remove_file(int clean
, const char *path
)
481 int update_cache
= index_only
|| clean
;
482 int update_working_directory
= !index_only
;
486 read_cache_from(getenv("GIT_INDEX_FILE"));
488 if (remove_file_from_cache(path
))
491 if (update_working_directory
)
494 if (errno
!= ENOENT
|| errno
!= EISDIR
)
501 static char *unique_path(const char *path
, const char *branch
)
503 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
506 char *p
= newpath
+ strlen(path
);
507 strcpy(newpath
, path
);
513 while (path_list_has_path(¤t_file_set
, newpath
) ||
514 path_list_has_path(¤t_directory_set
, newpath
) ||
515 lstat(newpath
, &st
) == 0)
516 sprintf(p
, "_%d", suffix
++);
518 path_list_insert(newpath
, ¤t_file_set
);
522 static int mkdir_p(const char *path
, unsigned long mode
)
524 /* path points to cache entries, so strdup before messing with it */
525 char *buf
= strdup(path
);
526 int result
= safe_create_leading_directories(buf
);
531 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
534 long ret
= xwrite(fd
, buf
, size
);
539 die("merge-recursive: %s", strerror(errno
));
541 die("merge-recursive: disk full?");
548 void update_file_flags(const unsigned char *sha
,
562 buf
= read_sha1_file(sha
, type
, &size
);
564 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
565 if (strcmp(type
, blob_type
) != 0)
566 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
570 if (mkdir_p(path
, 0777))
571 die("failed to create path %s: %s", path
, strerror(errno
));
577 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
579 die("failed to open %s: %s", path
, strerror(errno
));
580 flush_buffer(fd
, buf
, size
);
582 } else if (S_ISLNK(mode
)) {
583 char *lnk
= malloc(size
+ 1);
584 memcpy(lnk
, buf
, size
);
590 die("do not know what to do with %06o %s '%s'",
591 mode
, sha1_to_hex(sha
), path
);
594 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
597 void update_file(int clean
,
598 const unsigned char *sha
,
602 update_file_flags(sha
, mode
, path
, index_only
|| clean
, !index_only
);
605 /* Low level file merging, update and removal */
607 struct merge_file_info
609 unsigned char sha
[20];
615 static char *git_unpack_file(const unsigned char *sha1
, char *path
)
622 buf
= read_sha1_file(sha1
, type
, &size
);
623 if (!buf
|| strcmp(type
, blob_type
))
624 die("unable to read blob object %s", sha1_to_hex(sha1
));
626 strcpy(path
, ".merge_file_XXXXXX");
629 die("unable to create temp-file");
630 flush_buffer(fd
, buf
, size
);
635 static struct merge_file_info
merge_file(struct diff_filespec
*o
,
636 struct diff_filespec
*a
, struct diff_filespec
*b
,
637 const char *branch1
, const char *branch2
)
639 struct merge_file_info result
;
643 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
645 if (S_ISREG(a
->mode
)) {
646 result
.mode
= a
->mode
;
647 memcpy(result
.sha
, a
->sha1
, 20);
649 result
.mode
= b
->mode
;
650 memcpy(result
.sha
, b
->sha1
, 20);
653 if (!sha_eq(a
->sha1
, o
->sha1
) && !sha_eq(b
->sha1
, o
->sha1
))
656 result
.mode
= a
->mode
== o
->mode
? b
->mode
: a
->mode
;
658 if (sha_eq(a
->sha1
, o
->sha1
))
659 memcpy(result
.sha
, b
->sha1
, 20);
660 else if (sha_eq(b
->sha1
, o
->sha1
))
661 memcpy(result
.sha
, a
->sha1
, 20);
662 else if (S_ISREG(a
->mode
)) {
668 const char *argv
[] = {
669 "merge", "-L", NULL
, "-L", NULL
, "-L", NULL
,
675 git_unpack_file(o
->sha1
, orig
);
676 git_unpack_file(a
->sha1
, src1
);
677 git_unpack_file(b
->sha1
, src2
);
679 argv
[2] = la
= strdup(mkpath("%s/%s", branch1
, a
->path
));
680 argv
[6] = lb
= strdup(mkpath("%s/%s", branch2
, b
->path
));
681 argv
[4] = lo
= strdup(mkpath("orig/%s", o
->path
));
686 code
= run_command_v(10, argv
);
691 if (code
&& code
< -256) {
692 die("Failed to execute 'merge'. merge(1) is used as the "
693 "file-level merge tool. Is 'merge' in your path?");
695 fd
= open(src1
, O_RDONLY
);
696 if (fd
< 0 || fstat(fd
, &st
) < 0 ||
697 index_fd(result
.sha
, fd
, &st
, 1,
699 die("Unable to add %s to database", src1
);
705 result
.clean
= WEXITSTATUS(code
) == 0;
707 if (!(S_ISLNK(a
->mode
) || S_ISLNK(b
->mode
)))
708 die("cannot merge modes?");
710 memcpy(result
.sha
, a
->sha1
, 20);
712 if (!sha_eq(a
->sha1
, b
->sha1
))
720 static void conflict_rename_rename(struct rename
*ren1
,
727 const char *ren1_dst
= ren1
->pair
->two
->path
;
728 const char *ren2_dst
= ren2
->pair
->two
->path
;
729 const char *dst_name1
= ren1_dst
;
730 const char *dst_name2
= ren2_dst
;
731 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
732 dst_name1
= del
[delp
++] = unique_path(ren1_dst
, branch1
);
733 output("%s is a directory in %s adding as %s instead",
734 ren1_dst
, branch2
, dst_name1
);
735 remove_file(0, ren1_dst
);
737 if (path_list_has_path(¤t_directory_set
, ren2_dst
)) {
738 dst_name2
= del
[delp
++] = unique_path(ren2_dst
, branch2
);
739 output("%s is a directory in %s adding as %s instead",
740 ren2_dst
, branch1
, dst_name2
);
741 remove_file(0, ren2_dst
);
743 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
744 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
749 static void conflict_rename_dir(struct rename
*ren1
,
752 char *new_path
= unique_path(ren1
->pair
->two
->path
, branch1
);
753 output("Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
754 remove_file(0, ren1
->pair
->two
->path
);
755 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
759 static void conflict_rename_rename_2(struct rename
*ren1
,
764 char *new_path1
= unique_path(ren1
->pair
->two
->path
, branch1
);
765 char *new_path2
= unique_path(ren2
->pair
->two
->path
, branch2
);
766 output("Renaming %s to %s and %s to %s instead",
767 ren1
->pair
->one
->path
, new_path1
,
768 ren2
->pair
->one
->path
, new_path2
);
769 remove_file(0, ren1
->pair
->two
->path
);
770 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
771 update_file(0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
776 static int process_renames(struct path_list
*a_renames
,
777 struct path_list
*b_renames
,
778 const char *a_branch
,
779 const char *b_branch
)
781 int clean_merge
= 1, i
, j
;
782 struct path_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
783 const struct rename
*sre
;
785 for (i
= 0; i
< a_renames
->nr
; i
++) {
786 sre
= a_renames
->items
[i
].util
;
787 path_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
790 for (i
= 0; i
< b_renames
->nr
; i
++) {
791 sre
= b_renames
->items
[i
].util
;
792 path_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
796 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
799 struct path_list
*renames1
, *renames2
, *renames2Dst
;
800 struct rename
*ren1
= NULL
, *ren2
= NULL
;
801 const char *branch1
, *branch2
;
802 const char *ren1_src
, *ren1_dst
;
804 if (i
>= a_renames
->nr
) {
806 ren2
= b_renames
->items
[j
++].util
;
807 } else if (j
>= b_renames
->nr
) {
809 ren1
= a_renames
->items
[i
++].util
;
811 compare
= strcmp(a_renames
->items
[i
].path
,
812 b_renames
->items
[j
].path
);
813 ren1
= a_renames
->items
[i
++].util
;
814 ren2
= b_renames
->items
[j
++].util
;
817 /* TODO: refactor, so that 1/2 are not needed */
819 renames1
= a_renames
;
820 renames2
= b_renames
;
821 renames2Dst
= &b_by_dst
;
826 renames1
= b_renames
;
827 renames2
= a_renames
;
828 renames2Dst
= &a_by_dst
;
835 src
= ren1
->pair
->one
->path
;
837 ren1
->dst_entry
->processed
= 1;
838 ren1
->src_entry
->processed
= 1;
844 ren1_src
= ren1
->pair
->one
->path
;
845 ren1_dst
= ren1
->pair
->two
->path
;
848 const char *ren2_src
= ren2
->pair
->one
->path
;
849 const char *ren2_dst
= ren2
->pair
->two
->path
;
850 /* Renamed in 1 and renamed in 2 */
851 if (strcmp(ren1_src
, ren2_src
) != 0)
852 die("ren1.src != ren2.src");
853 ren2
->dst_entry
->processed
= 1;
855 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
857 output("CONFLICT (rename/rename): "
858 "Rename %s->%s in branch %s "
859 "rename %s->%s in %s",
860 src
, ren1_dst
, branch1
,
861 src
, ren2_dst
, branch2
);
862 conflict_rename_rename(ren1
, branch1
, ren2
, branch2
);
864 struct merge_file_info mfi
;
865 remove_file(1, ren1_src
);
866 mfi
= merge_file(ren1
->pair
->one
,
871 if (mfi
.merge
|| !mfi
.clean
)
872 output("Renaming %s->%s", src
, ren1_dst
);
875 output("Auto-merging %s", ren1_dst
);
878 output("CONFLICT (content): merge conflict in %s",
883 update_stages(ren1_dst
,
889 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
892 /* Renamed in 1, maybe changed in 2 */
893 struct path_list_item
*item
;
894 /* we only use sha1 and mode of these */
895 struct diff_filespec src_other
, dst_other
;
896 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
898 remove_file(1, ren1_src
);
900 memcpy(src_other
.sha1
,
901 ren1
->src_entry
->stages
[stage
].sha
, 20);
902 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
903 memcpy(dst_other
.sha1
,
904 ren1
->dst_entry
->stages
[stage
].sha
, 20);
905 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
909 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
911 output("CONFLICT (rename/directory): Rename %s->%s in %s "
912 " directory %s added in %s",
913 ren1_src
, ren1_dst
, branch1
,
915 conflict_rename_dir(ren1
, branch1
);
916 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
918 output("CONFLICT (rename/delete): Rename %s->%s in %s "
920 ren1_src
, ren1_dst
, branch1
,
922 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
923 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
924 const char *new_path
;
927 output("CONFLICT (rename/add): Rename %s->%s in %s. "
929 ren1_src
, ren1_dst
, branch1
,
931 new_path
= unique_path(ren1_dst
, branch2
);
932 output("Adding as %s instead", new_path
);
933 update_file(0, dst_other
.sha1
, dst_other
.mode
, new_path
);
934 } else if ((item
= path_list_lookup(ren1_dst
, renames2Dst
))) {
938 output("CONFLICT (rename/rename): Rename %s->%s in %s. "
939 "Rename %s->%s in %s",
940 ren1_src
, ren1_dst
, branch1
,
941 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
942 conflict_rename_rename_2(ren1
, branch1
, ren2
, branch2
);
947 struct diff_filespec
*o
, *a
, *b
;
948 struct merge_file_info mfi
;
949 src_other
.path
= (char *)ren1_src
;
952 if (a_renames
== renames1
) {
959 mfi
= merge_file(o
, a
, b
,
962 if (mfi
.merge
|| !mfi
.clean
)
963 output("Renaming %s => %s", ren1_src
, ren1_dst
);
965 output("Auto-merging %s", ren1_dst
);
967 output("CONFLICT (rename/modify): Merge conflict in %s",
972 update_stages(ren1_dst
,
975 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
979 path_list_clear(&a_by_dst
, 0);
980 path_list_clear(&b_by_dst
, 0);
987 static unsigned char *has_sha(const unsigned char *sha
)
989 return memcmp(sha
, null_sha1
, 20) == 0 ? NULL
: (unsigned char *)sha
;
992 /* Per entry merge function */
993 static int process_entry(const char *path
, struct stage_data
*entry
,
998 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
999 print_index_entry("\tpath: ", entry);
1001 int clean_merge
= 1;
1002 unsigned char *o_sha
= has_sha(entry
->stages
[1].sha
);
1003 unsigned char *a_sha
= has_sha(entry
->stages
[2].sha
);
1004 unsigned char *b_sha
= has_sha(entry
->stages
[3].sha
);
1005 unsigned o_mode
= entry
->stages
[1].mode
;
1006 unsigned a_mode
= entry
->stages
[2].mode
;
1007 unsigned b_mode
= entry
->stages
[3].mode
;
1009 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1010 /* Case A: Deleted in one */
1011 if ((!a_sha
&& !b_sha
) ||
1012 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1013 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1014 /* Deleted in both or deleted in one and
1015 * unchanged in the other */
1017 output("Removing %s", path
);
1018 remove_file(1, path
);
1020 /* Deleted in one and changed in the other */
1023 output("CONFLICT (delete/modify): %s deleted in %s "
1024 "and modified in %s. Version %s of %s left in tree.",
1026 branch2
, branch2
, path
);
1027 update_file(0, b_sha
, b_mode
, path
);
1029 output("CONFLICT (delete/modify): %s deleted in %s "
1030 "and modified in %s. Version %s of %s left in tree.",
1032 branch1
, branch1
, path
);
1033 update_file(0, a_sha
, a_mode
, path
);
1037 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1038 (!o_sha
&& !a_sha
&& b_sha
)) {
1039 /* Case B: Added in one. */
1040 const char *add_branch
;
1041 const char *other_branch
;
1043 const unsigned char *sha
;
1047 add_branch
= branch1
;
1048 other_branch
= branch2
;
1051 conf
= "file/directory";
1053 add_branch
= branch2
;
1054 other_branch
= branch1
;
1057 conf
= "directory/file";
1059 if (path_list_has_path(¤t_directory_set
, path
)) {
1060 const char *new_path
= unique_path(path
, add_branch
);
1062 output("CONFLICT (%s): There is a directory with name %s in %s. "
1064 conf
, path
, other_branch
, path
, new_path
);
1065 remove_file(0, path
);
1066 update_file(0, sha
, mode
, new_path
);
1068 output("Adding %s", path
);
1069 update_file(1, sha
, mode
, path
);
1071 } else if (!o_sha
&& a_sha
&& b_sha
) {
1072 /* Case C: Added in both (check for same permissions). */
1073 if (sha_eq(a_sha
, b_sha
)) {
1074 if (a_mode
!= b_mode
) {
1076 output("CONFLICT: File %s added identically in both branches, "
1077 "but permissions conflict %06o->%06o",
1078 path
, a_mode
, b_mode
);
1079 output("CONFLICT: adding with permission: %06o", a_mode
);
1080 update_file(0, a_sha
, a_mode
, path
);
1082 /* This case is handled by git-read-tree */
1083 assert(0 && "This case must be handled by git-read-tree");
1086 const char *new_path1
, *new_path2
;
1088 new_path1
= unique_path(path
, branch1
);
1089 new_path2
= unique_path(path
, branch2
);
1090 output("CONFLICT (add/add): File %s added non-identically "
1091 "in both branches. Adding as %s and %s instead.",
1092 path
, new_path1
, new_path2
);
1093 remove_file(0, path
);
1094 update_file(0, a_sha
, a_mode
, new_path1
);
1095 update_file(0, b_sha
, b_mode
, new_path2
);
1098 } else if (o_sha
&& a_sha
&& b_sha
) {
1099 /* case D: Modified in both, but differently. */
1100 struct merge_file_info mfi
;
1101 struct diff_filespec o
, a
, b
;
1103 output("Auto-merging %s", path
);
1104 o
.path
= a
.path
= b
.path
= (char *)path
;
1105 memcpy(o
.sha1
, o_sha
, 20);
1107 memcpy(a
.sha1
, a_sha
, 20);
1109 memcpy(b
.sha1
, b_sha
, 20);
1112 mfi
= merge_file(&o
, &a
, &b
,
1116 update_file(1, mfi
.sha
, mfi
.mode
, path
);
1119 output("CONFLICT (content): Merge conflict in %s", path
);
1122 update_file(0, mfi
.sha
, mfi
.mode
, path
);
1124 update_file_flags(mfi
.sha
, mfi
.mode
, path
,
1125 0 /* update_cache */, 1 /* update_working_directory */);
1128 die("Fatal merge failure, shouldn't happen.");
1136 static int merge_trees(struct tree
*head
,
1138 struct tree
*common
,
1139 const char *branch1
,
1140 const char *branch2
,
1141 struct tree
**result
)
1144 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1145 output("Already uptodate!");
1150 code
= git_merge_trees(index_only
, common
, head
, merge
);
1153 die("merging of trees %s and %s failed",
1154 sha1_to_hex(head
->object
.sha1
),
1155 sha1_to_hex(merge
->object
.sha1
));
1157 *result
= git_write_tree();
1160 struct path_list
*entries
, *re_head
, *re_merge
;
1162 path_list_clear(¤t_file_set
, 1);
1163 path_list_clear(¤t_directory_set
, 1);
1164 get_files_dirs(head
);
1165 get_files_dirs(merge
);
1167 entries
= get_unmerged();
1168 re_head
= get_renames(head
, common
, head
, merge
, entries
);
1169 re_merge
= get_renames(merge
, common
, head
, merge
, entries
);
1170 clean
= process_renames(re_head
, re_merge
,
1172 for (i
= 0; i
< entries
->nr
; i
++) {
1173 const char *path
= entries
->items
[i
].path
;
1174 struct stage_data
*e
= entries
->items
[i
].util
;
1177 if (!process_entry(path
, e
, branch1
, branch2
))
1181 path_list_clear(re_merge
, 0);
1182 path_list_clear(re_head
, 0);
1183 path_list_clear(entries
, 1);
1185 if (clean
|| index_only
)
1186 *result
= git_write_tree();
1191 printf("merging of trees %s and %s resulted in %s\n",
1192 sha1_to_hex(head
->object
.sha1
),
1193 sha1_to_hex(merge
->object
.sha1
),
1194 sha1_to_hex((*result
)->object
.sha1
));
1201 * Merge the commits h1 and h2, return the resulting virtual
1202 * commit object and a flag indicating the cleaness of the merge.
1205 int merge(struct commit
*h1
,
1207 const char *branch1
,
1208 const char *branch2
,
1209 int call_depth
/* =0 */,
1210 struct commit
*ancestor
/* =None */,
1211 struct commit
**result
)
1213 struct commit_list
*ca
= NULL
, *iter
;
1214 struct commit
*merged_common_ancestors
;
1215 struct tree
*mrtree
;
1219 output_commit_title(h1
);
1220 output_commit_title(h2
);
1223 commit_list_insert(ancestor
, &ca
);
1225 ca
= get_merge_bases(h1
, h2
, 1);
1227 output("found %u common ancestor(s):", commit_list_count(ca
));
1228 for (iter
= ca
; iter
; iter
= iter
->next
)
1229 output_commit_title(iter
->item
);
1231 merged_common_ancestors
= pop_commit(&ca
);
1233 for (iter
= ca
; iter
; iter
= iter
->next
) {
1234 output_indent
= call_depth
+ 1;
1236 * When the merge fails, the result contains files
1237 * with conflict markers. The cleanness flag is
1238 * ignored, it was never acutally used, as result of
1239 * merge_trees has always overwritten it: the commited
1240 * "conflicts" were already resolved.
1242 merge(merged_common_ancestors
, iter
->item
,
1243 "Temporary merge branch 1",
1244 "Temporary merge branch 2",
1247 &merged_common_ancestors
);
1248 output_indent
= call_depth
;
1250 if (!merged_common_ancestors
)
1251 die("merge returned no commit");
1254 if (call_depth
== 0) {
1255 setup_index(0 /* $GIT_DIR/index */);
1258 setup_index(1 /* temporary index */);
1259 git_read_tree(h1
->tree
);
1263 clean
= merge_trees(h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1264 branch1
, branch2
, &mrtree
);
1266 if (!ancestor
&& (clean
|| index_only
)) {
1267 *result
= make_virtual_commit(mrtree
, "merged tree");
1268 commit_list_insert(h1
, &(*result
)->parents
);
1269 commit_list_insert(h2
, &(*result
)->parents
->next
);
1276 static struct commit
*get_ref(const char *ref
)
1278 unsigned char sha1
[20];
1279 struct object
*object
;
1281 if (get_sha1(ref
, sha1
))
1282 die("Could not resolve ref '%s'", ref
);
1283 object
= deref_tag(parse_object(sha1
), ref
, strlen(ref
));
1284 if (object
->type
!= OBJ_COMMIT
)
1286 if (parse_commit((struct commit
*)object
))
1287 die("Could not parse commit '%s'", sha1_to_hex(object
->sha1
));
1288 return (struct commit
*)object
;
1291 int main(int argc
, char *argv
[])
1293 static const char *bases
[2];
1294 static unsigned bases_count
= 0;
1296 const char *branch1
, *branch2
;
1297 struct commit
*result
, *h1
, *h2
;
1299 original_index_file
= getenv("GIT_INDEX_FILE");
1301 if (!original_index_file
)
1302 original_index_file
= strdup(git_path("index"));
1304 temporary_index_file
= strdup(git_path("mrg-rcrsv-tmp-idx"));
1307 die("Usage: %s <base>... -- <head> <remote> ...\n", argv
[0]);
1309 for (i
= 1; i
< argc
; ++i
) {
1310 if (!strcmp(argv
[i
], "--"))
1312 if (bases_count
< sizeof(bases
)/sizeof(*bases
))
1313 bases
[bases_count
++] = argv
[i
];
1315 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
1316 die("Not handling anything other than two heads merge.");
1318 branch1
= argv
[++i
];
1319 branch2
= argv
[++i
];
1320 printf("Merging %s with %s\n", branch1
, branch2
);
1322 h1
= get_ref(branch1
);
1323 h2
= get_ref(branch2
);
1325 if (bases_count
== 1) {
1326 struct commit
*ancestor
= get_ref(bases
[0]);
1327 clean
= merge(h1
, h2
, branch1
, branch2
, 0, ancestor
, &result
);
1329 clean
= merge(h1
, h2
, branch1
, branch2
, 0, NULL
, &result
);
1334 return clean
? 0: 1;