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"
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
++;
50 * Since we use get_tree_entry(), which does not put the read object into
51 * the object pool, we cannot rely on a == b.
53 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
57 return a
&& b
&& memcmp(a
, b
, 20) == 0;
61 * Since we want to write the index eventually, we cannot reuse the index
62 * for these (temporary) data.
69 unsigned char sha
[20];
74 static struct path_list current_file_set
= {NULL
, 0, 0, 1};
75 static struct path_list current_directory_set
= {NULL
, 0, 0, 1};
77 static int output_indent
= 0;
79 static void output(const char *fmt
, ...)
83 for (i
= output_indent
; i
--;)
86 vfprintf(stdout
, fmt
, args
);
91 static void output_commit_title(struct commit
*commit
)
94 for (i
= output_indent
; i
--;)
97 printf("virtual %s\n", (char *)commit
->util
);
99 printf("%s ", sha1_to_hex(commit
->object
.sha1
));
100 if (parse_commit(commit
) != 0)
101 printf("(bad commit)\n");
105 for (s
= commit
->buffer
; *s
; s
++)
106 if (*s
== '\n' && s
[1] == '\n') {
110 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
112 printf("%.*s\n", len
, s
);
117 static const char *original_index_file
;
118 static const char *temporary_index_file
;
119 static int cache_dirty
= 0;
121 static int flush_cache(void)
123 /* flush temporary index */
124 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
125 int fd
= hold_lock_file_for_update(lock
, getenv("GIT_INDEX_FILE"));
127 die("could not lock %s", temporary_index_file
);
128 if (write_cache(fd
, active_cache
, active_nr
) ||
129 close(fd
) || commit_lock_file(lock
))
130 die ("unable to write %s", getenv("GIT_INDEX_FILE"));
136 static void setup_index(int temp
)
138 const char *idx
= temp
? temporary_index_file
: original_index_file
;
140 die("fatal: cache changed flush_cache();");
141 unlink(temporary_index_file
);
142 setenv("GIT_INDEX_FILE", idx
, 1);
146 static struct cache_entry
*make_cache_entry(unsigned int mode
,
147 const unsigned char *sha1
, const char *path
, int stage
, int refresh
)
150 struct cache_entry
*ce
;
152 if (!verify_path(path
))
156 size
= cache_entry_size(len
);
157 ce
= xcalloc(1, size
);
159 memcpy(ce
->sha1
, sha1
, 20);
160 memcpy(ce
->name
, path
, len
);
161 ce
->ce_flags
= create_ce_flags(len
, stage
);
162 ce
->ce_mode
= create_ce_mode(mode
);
165 return refresh_cache_entry(ce
, 0);
170 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
171 const char *path
, int stage
, int refresh
, int options
)
173 struct cache_entry
*ce
;
175 read_cache_from(getenv("GIT_INDEX_FILE"));
177 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
179 return error("cache_addinfo failed: %s", strerror(cache_errno
));
180 return add_cache_entry(ce
, options
);
184 * This is a global variable which is used in a number of places but
185 * only written to in the 'merge' function.
187 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
188 * don't update the working directory.
189 * 0 => Leave unmerged entries in the cache and update
190 * the working directory.
192 static int index_only
= 0;
195 * TODO: this can be streamlined by refactoring builtin-read-tree.c
197 static int git_read_tree(const struct tree
*tree
)
200 const char *argv
[] = { "git-read-tree", NULL
, NULL
, };
202 die("read-tree with dirty cache");
203 argv
[1] = sha1_to_hex(tree
->object
.sha1
);
204 rc
= run_command_v(2, argv
);
205 return rc
< 0 ? -1: rc
;
209 * TODO: this can be streamlined by refactoring builtin-read-tree.c
211 static int git_merge_trees(const char *update_arg
,
217 const char *argv
[] = {
218 "git-read-tree", NULL
, "-m", NULL
, NULL
, NULL
,
223 argv
[1] = update_arg
;
224 argv
[3] = sha1_to_hex(common
->object
.sha1
);
225 argv
[4] = sha1_to_hex(head
->object
.sha1
);
226 argv
[5] = sha1_to_hex(merge
->object
.sha1
);
227 rc
= run_command_v(6, argv
);
228 return rc
< 0 ? -1: rc
;
232 * TODO: this can be streamlined by refactoring builtin-write-tree.c
234 static struct tree
*git_write_tree(void)
239 unsigned char sha1
[20];
244 fp
= popen("git-write-tree 2>/dev/null", "r");
245 while ((ch
= fgetc(fp
)) != EOF
)
246 if (i
< sizeof(buf
)-1 && ch
>= '0' && ch
<= 'f')
251 if (rc
== -1 || WEXITSTATUS(rc
))
254 if (get_sha1(buf
, sha1
) != 0)
256 return lookup_tree(sha1
);
259 static int save_files_dirs(const unsigned char *sha1
,
260 const char *base
, int baselen
, const char *path
,
261 unsigned int mode
, int stage
)
263 int len
= strlen(path
);
264 char *newpath
= malloc(baselen
+ len
+ 1);
265 memcpy(newpath
, base
, baselen
);
266 memcpy(newpath
+ baselen
, path
, len
);
267 newpath
[baselen
+ len
] = '\0';
270 path_list_insert(newpath
, ¤t_directory_set
);
272 path_list_insert(newpath
, ¤t_file_set
);
275 return READ_TREE_RECURSIVE
;
278 static int get_files_dirs(struct tree
*tree
)
281 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
) != 0)
283 n
= current_file_set
.nr
+ current_directory_set
.nr
;
288 * Returns a index_entry instance which doesn't have to correspond to
289 * a real cache entry in Git's index.
291 static struct stage_data
*insert_stage_data(const char *path
,
292 struct tree
*o
, struct tree
*a
, struct tree
*b
,
293 struct path_list
*entries
)
295 struct path_list_item
*item
;
296 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
297 get_tree_entry(o
->object
.sha1
, path
,
298 e
->stages
[1].sha
, &e
->stages
[1].mode
);
299 get_tree_entry(a
->object
.sha1
, path
,
300 e
->stages
[2].sha
, &e
->stages
[2].mode
);
301 get_tree_entry(b
->object
.sha1
, path
,
302 e
->stages
[3].sha
, &e
->stages
[3].mode
);
303 item
= path_list_insert(path
, entries
);
309 * Create a dictionary mapping file names to stage_data objects. The
310 * dictionary contains one entry for every path with a non-zero stage entry.
312 static struct path_list
*get_unmerged(void)
314 struct path_list
*unmerged
= xcalloc(1, sizeof(struct path_list
));
317 unmerged
->strdup_paths
= 1;
319 read_cache_from(getenv("GIT_INDEX_FILE"));
322 for (i
= 0; i
< active_nr
; i
++) {
323 struct path_list_item
*item
;
324 struct stage_data
*e
;
325 struct cache_entry
*ce
= active_cache
[i
];
329 item
= path_list_lookup(ce
->name
, unmerged
);
331 item
= path_list_insert(ce
->name
, unmerged
);
332 item
->util
= xcalloc(1, sizeof(struct stage_data
));
335 e
->stages
[ce_stage(ce
)].mode
= ntohl(ce
->ce_mode
);
336 memcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
, 20);
344 struct diff_filepair
*pair
;
345 struct stage_data
*src_entry
;
346 struct stage_data
*dst_entry
;
347 unsigned processed
:1;
351 * Get information of all renames which occured between 'o_tree' and
352 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
353 * 'b_tree') to be able to associate the correct cache entries with
354 * the rename information. 'tree' is always equal to either a_tree or b_tree.
356 static struct path_list
*get_renames(struct tree
*tree
,
360 struct path_list
*entries
)
363 struct path_list
*renames
;
364 struct diff_options opts
;
366 renames
= xcalloc(1, sizeof(struct path_list
));
369 opts
.detect_rename
= DIFF_DETECT_RENAME
;
370 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
371 if (diff_setup_done(&opts
) < 0)
372 die("diff setup failed");
373 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
375 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
376 struct path_list_item
*item
;
378 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
379 if (pair
->status
!= 'R') {
380 diff_free_filepair(pair
);
383 re
= xmalloc(sizeof(*re
));
386 item
= path_list_lookup(re
->pair
->one
->path
, entries
);
388 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
389 o_tree
, a_tree
, b_tree
, entries
);
391 re
->src_entry
= item
->util
;
393 item
= path_list_lookup(re
->pair
->two
->path
, entries
);
395 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
396 o_tree
, a_tree
, b_tree
, entries
);
398 re
->dst_entry
= item
->util
;
399 item
= path_list_insert(pair
->one
->path
, renames
);
402 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
403 diff_queued_diff
.nr
= 0;
408 int update_stages(const char *path
, struct diff_filespec
*o
,
409 struct diff_filespec
*a
, struct diff_filespec
*b
, int clear
)
411 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
413 if (remove_file_from_cache(path
))
416 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
419 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
422 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
427 static int remove_path(const char *name
)
436 dirs
= malloc(len
+1);
437 memcpy(dirs
, name
, len
);
439 while ((slash
= strrchr(name
, '/'))) {
442 if (rmdir(name
) != 0)
450 * TODO: once we no longer call external programs, we'd probably be better off
451 * not setting / getting the environment variable GIT_INDEX_FILE all the time.
453 int remove_file(int clean
, const char *path
)
455 int update_cache
= index_only
|| clean
;
456 int update_working_directory
= !index_only
;
460 read_cache_from(getenv("GIT_INDEX_FILE"));
462 if (remove_file_from_cache(path
))
465 if (update_working_directory
)
468 if (errno
!= ENOENT
|| errno
!= EISDIR
)
475 static char *unique_path(const char *path
, const char *branch
)
477 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
480 char *p
= newpath
+ strlen(newpath
);
481 strcpy(newpath
, path
);
482 strcat(newpath
, "~");
487 while (path_list_has_path(¤t_file_set
, newpath
) ||
488 path_list_has_path(¤t_directory_set
, newpath
) ||
489 lstat(newpath
, &st
) == 0)
490 sprintf(p
, "_%d", suffix
++);
492 path_list_insert(newpath
, ¤t_file_set
);
496 static int mkdir_p(const char *path
, unsigned long mode
)
498 /* path points to cache entries, so strdup before messing with it */
499 char *buf
= strdup(path
);
500 int result
= safe_create_leading_directories(buf
);
505 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
508 long ret
= xwrite(fd
, buf
, size
);
513 die("merge-recursive: %s", strerror(errno
));
515 die("merge-recursive: disk full?");
522 void update_file_flags(const unsigned char *sha
,
536 buf
= read_sha1_file(sha
, type
, &size
);
538 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
539 if (strcmp(type
, blob_type
) != 0)
540 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
544 if (mkdir_p(path
, 0777))
545 die("failed to create path %s: %s", path
, strerror(errno
));
551 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
553 die("failed to open %s: %s", path
, strerror(errno
));
554 flush_buffer(fd
, buf
, size
);
556 } else if (S_ISLNK(mode
)) {
557 char *lnk
= malloc(size
+ 1);
558 memcpy(lnk
, buf
, size
);
564 die("do not know what to do with %06o %s '%s'",
565 mode
, sha1_to_hex(sha
), path
);
568 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
571 void update_file(int clean
,
572 const unsigned char *sha
,
576 update_file_flags(sha
, mode
, path
, index_only
|| clean
, !index_only
);
579 /* Low level file merging, update and removal */
581 struct merge_file_info
583 unsigned char sha
[20];
589 static char *git_unpack_file(const unsigned char *sha1
, char *path
)
596 buf
= read_sha1_file(sha1
, type
, &size
);
597 if (!buf
|| strcmp(type
, blob_type
))
598 die("unable to read blob object %s", sha1_to_hex(sha1
));
600 strcpy(path
, ".merge_file_XXXXXX");
603 die("unable to create temp-file");
604 flush_buffer(fd
, buf
, size
);
609 static struct merge_file_info
merge_file(struct diff_filespec
*o
,
610 struct diff_filespec
*a
, struct diff_filespec
*b
,
611 const char *branch1
, const char *branch2
)
613 struct merge_file_info result
;
617 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
619 if (S_ISREG(a
->mode
)) {
620 result
.mode
= a
->mode
;
621 memcpy(result
.sha
, a
->sha1
, 20);
623 result
.mode
= b
->mode
;
624 memcpy(result
.sha
, b
->sha1
, 20);
627 if (!sha_eq(a
->sha1
, o
->sha1
) && !sha_eq(b
->sha1
, o
->sha1
))
630 result
.mode
= a
->mode
== o
->mode
? b
->mode
: a
->mode
;
632 if (sha_eq(a
->sha1
, o
->sha1
))
633 memcpy(result
.sha
, b
->sha1
, 20);
634 else if (sha_eq(b
->sha1
, o
->sha1
))
635 memcpy(result
.sha
, a
->sha1
, 20);
636 else if (S_ISREG(a
->mode
)) {
642 const char *argv
[] = {
643 "merge", "-L", NULL
, "-L", NULL
, "-L", NULL
,
649 git_unpack_file(o
->sha1
, orig
);
650 git_unpack_file(a
->sha1
, src1
);
651 git_unpack_file(b
->sha1
, src2
);
653 argv
[2] = la
= strdup(mkpath("%s/%s", branch1
, a
->path
));
654 argv
[6] = lb
= strdup(mkpath("%s/%s", branch2
, b
->path
));
655 argv
[4] = lo
= strdup(mkpath("orig/%s", o
->path
));
660 code
= run_command_v(10, argv
);
665 if (code
&& code
< -256) {
666 die("Failed to execute 'merge'. merge(1) is used as the "
667 "file-level merge tool. Is 'merge' in your path?");
669 fd
= open(src1
, O_RDONLY
);
670 if (fd
< 0 || fstat(fd
, &st
) < 0 ||
671 index_fd(result
.sha
, fd
, &st
, 1,
673 die("Unable to add %s to database", src1
);
679 result
.clean
= WEXITSTATUS(code
) == 0;
681 if (!(S_ISLNK(a
->mode
) || S_ISLNK(b
->mode
)))
682 die("cannot merge modes?");
684 memcpy(result
.sha
, a
->sha1
, 20);
686 if (!sha_eq(a
->sha1
, b
->sha1
))
694 static void conflict_rename_rename(struct rename
*ren1
,
701 const char *ren1_dst
= ren1
->pair
->two
->path
;
702 const char *ren2_dst
= ren2
->pair
->two
->path
;
703 const char *dst_name1
= ren1_dst
;
704 const char *dst_name2
= ren2_dst
;
705 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
706 dst_name1
= del
[delp
++] = unique_path(ren1_dst
, branch1
);
707 output("%s is a directory in %s adding as %s instead",
708 ren1_dst
, branch2
, dst_name1
);
709 remove_file(0, ren1_dst
);
711 if (path_list_has_path(¤t_directory_set
, ren2_dst
)) {
712 dst_name2
= del
[delp
++] = unique_path(ren2_dst
, branch2
);
713 output("%s is a directory in %s adding as %s instead",
714 ren2_dst
, branch1
, dst_name2
);
715 remove_file(0, ren2_dst
);
717 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
718 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
723 static void conflict_rename_dir(struct rename
*ren1
,
726 char *new_path
= unique_path(ren1
->pair
->two
->path
, branch1
);
727 output("Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
728 remove_file(0, ren1
->pair
->two
->path
);
729 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
733 static void conflict_rename_rename_2(struct rename
*ren1
,
738 char *new_path1
= unique_path(ren1
->pair
->two
->path
, branch1
);
739 char *new_path2
= unique_path(ren2
->pair
->two
->path
, branch2
);
740 output("Renaming %s to %s and %s to %s instead",
741 ren1
->pair
->one
->path
, new_path1
,
742 ren2
->pair
->one
->path
, new_path2
);
743 remove_file(0, ren1
->pair
->two
->path
);
744 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
745 update_file(0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
750 static int process_renames(struct path_list
*a_renames
,
751 struct path_list
*b_renames
,
752 const char *a_branch
,
753 const char *b_branch
)
755 int clean_merge
= 1, i
, j
;
756 struct path_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
757 const struct rename
*sre
;
759 for (i
= 0; i
< a_renames
->nr
; i
++) {
760 sre
= a_renames
->items
[i
].util
;
761 path_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
764 for (i
= 0; i
< b_renames
->nr
; i
++) {
765 sre
= b_renames
->items
[i
].util
;
766 path_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
770 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
773 struct path_list
*renames1
, *renames2
, *renames2Dst
;
774 struct rename
*ren1
= NULL
, *ren2
= NULL
;
775 const char *branch1
, *branch2
;
776 const char *ren1_src
, *ren1_dst
;
778 if (i
>= a_renames
->nr
) {
780 ren2
= b_renames
->items
[j
++].util
;
781 } else if (j
>= b_renames
->nr
) {
783 ren1
= a_renames
->items
[i
++].util
;
785 compare
= strcmp(a_renames
->items
[i
].path
,
786 b_renames
->items
[j
].path
);
787 ren1
= a_renames
->items
[i
++].util
;
788 ren2
= b_renames
->items
[j
++].util
;
791 /* TODO: refactor, so that 1/2 are not needed */
793 renames1
= a_renames
;
794 renames2
= b_renames
;
795 renames2Dst
= &b_by_dst
;
800 renames1
= b_renames
;
801 renames2
= a_renames
;
802 renames2Dst
= &a_by_dst
;
809 src
= ren1
->pair
->one
->path
;
811 ren1
->dst_entry
->processed
= 1;
812 ren1
->src_entry
->processed
= 1;
818 ren1_src
= ren1
->pair
->one
->path
;
819 ren1_dst
= ren1
->pair
->two
->path
;
822 const char *ren2_src
= ren2
->pair
->one
->path
;
823 const char *ren2_dst
= ren2
->pair
->two
->path
;
824 /* Renamed in 1 and renamed in 2 */
825 if (strcmp(ren1_src
, ren2_src
) != 0)
826 die("ren1.src != ren2.src");
827 ren2
->dst_entry
->processed
= 1;
829 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
831 output("CONFLICT (rename/rename): "
832 "Rename %s->%s in branch %s "
833 "rename %s->%s in %s",
834 src
, ren1_dst
, branch1
,
835 src
, ren2_dst
, branch2
);
836 conflict_rename_rename(ren1
, branch1
, ren2
, branch2
);
838 struct merge_file_info mfi
;
839 remove_file(1, ren1_src
);
840 mfi
= merge_file(ren1
->pair
->one
,
845 if (mfi
.merge
|| !mfi
.clean
)
846 output("Renaming %s->%s", src
, ren1_dst
);
849 output("Auto-merging %s", ren1_dst
);
852 output("CONFLICT (content): merge conflict in %s",
857 update_stages(ren1_dst
,
863 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
866 /* Renamed in 1, maybe changed in 2 */
867 struct path_list_item
*item
;
868 /* we only use sha1 and mode of these */
869 struct diff_filespec src_other
, dst_other
;
870 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
872 remove_file(1, ren1_src
);
874 memcpy(src_other
.sha1
,
875 ren1
->src_entry
->stages
[stage
].sha
, 20);
876 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
877 memcpy(dst_other
.sha1
,
878 ren1
->dst_entry
->stages
[stage
].sha
, 20);
879 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
883 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
885 output("CONFLICT (rename/directory): Rename %s->%s in %s "
886 " directory %s added in %s",
887 ren1_src
, ren1_dst
, branch1
,
889 conflict_rename_dir(ren1
, branch1
);
890 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
892 output("CONFLICT (rename/delete): Rename %s->%s in %s "
894 ren1_src
, ren1_dst
, branch1
,
896 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
897 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
898 const char *new_path
;
901 output("CONFLICT (rename/add): Rename %s->%s in %s. "
903 ren1_src
, ren1_dst
, branch1
,
905 new_path
= unique_path(ren1_dst
, branch2
);
906 output("Adding as %s instead", new_path
);
907 update_file(0, dst_other
.sha1
, dst_other
.mode
, new_path
);
908 } else if ((item
= path_list_lookup(ren1_dst
, renames2Dst
))) {
912 output("CONFLICT (rename/rename): Rename %s->%s in %s. "
913 "Rename %s->%s in %s",
914 ren1_src
, ren1_dst
, branch1
,
915 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
916 conflict_rename_rename_2(ren1
, branch1
, ren2
, branch2
);
921 struct diff_filespec
*o
, *a
, *b
;
922 struct merge_file_info mfi
;
923 src_other
.path
= (char *)ren1_src
;
926 if (a_renames
== renames1
) {
933 mfi
= merge_file(o
, a
, b
,
936 if (mfi
.merge
|| !mfi
.clean
)
937 output("Renaming %s => %s", ren1_src
, ren1_dst
);
939 output("Auto-merging %s", ren1_dst
);
941 output("CONFLICT (rename/modify): Merge conflict in %s",
946 update_stages(ren1_dst
,
949 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
953 path_list_clear(&a_by_dst
, 0);
954 path_list_clear(&b_by_dst
, 0);
961 static unsigned char *has_sha(const unsigned char *sha
)
963 return memcmp(sha
, null_sha1
, 20) == 0 ? NULL
: (unsigned char *)sha
;
966 /* Per entry merge function */
967 static int process_entry(const char *path
, struct stage_data
*entry
,
972 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
973 print_index_entry("\tpath: ", entry);
976 unsigned char *o_sha
= has_sha(entry
->stages
[1].sha
);
977 unsigned char *a_sha
= has_sha(entry
->stages
[2].sha
);
978 unsigned char *b_sha
= has_sha(entry
->stages
[3].sha
);
979 unsigned o_mode
= entry
->stages
[1].mode
;
980 unsigned a_mode
= entry
->stages
[2].mode
;
981 unsigned b_mode
= entry
->stages
[3].mode
;
983 if (o_sha
&& (!a_sha
|| !b_sha
)) {
984 /* Case A: Deleted in one */
985 if ((!a_sha
&& !b_sha
) ||
986 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
987 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
988 /* Deleted in both or deleted in one and
989 * unchanged in the other */
991 output("Removing %s", path
);
992 remove_file(1, path
);
994 /* Deleted in one and changed in the other */
997 output("CONFLICT (delete/modify): %s deleted in %s "
998 "and modified in %s. Version %s of %s left in tree.",
1000 branch2
, branch2
, path
);
1001 update_file(0, b_sha
, b_mode
, path
);
1003 output("CONFLICT (delete/modify): %s deleted in %s "
1004 "and modified in %s. Version %s of %s left in tree.",
1006 branch1
, branch1
, path
);
1007 update_file(0, a_sha
, a_mode
, path
);
1011 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1012 (!o_sha
&& !a_sha
&& b_sha
)) {
1013 /* Case B: Added in one. */
1014 const char *add_branch
;
1015 const char *other_branch
;
1017 const unsigned char *sha
;
1021 add_branch
= branch1
;
1022 other_branch
= branch2
;
1025 conf
= "file/directory";
1027 add_branch
= branch2
;
1028 other_branch
= branch1
;
1031 conf
= "directory/file";
1033 if (path_list_has_path(¤t_directory_set
, path
)) {
1034 const char *new_path
= unique_path(path
, add_branch
);
1036 output("CONFLICT (%s): There is a directory with name %s in %s. "
1038 conf
, path
, other_branch
, path
, new_path
);
1039 remove_file(0, path
);
1040 update_file(0, sha
, mode
, new_path
);
1042 output("Adding %s", path
);
1043 update_file(1, sha
, mode
, path
);
1045 } else if (!o_sha
&& a_sha
&& b_sha
) {
1046 /* Case C: Added in both (check for same permissions). */
1047 if (sha_eq(a_sha
, b_sha
)) {
1048 if (a_mode
!= b_mode
) {
1050 output("CONFLICT: File %s added identically in both branches, "
1051 "but permissions conflict %06o->%06o",
1052 path
, a_mode
, b_mode
);
1053 output("CONFLICT: adding with permission: %06o", a_mode
);
1054 update_file(0, a_sha
, a_mode
, path
);
1056 /* This case is handled by git-read-tree */
1057 assert(0 && "This case must be handled by git-read-tree");
1060 const char *new_path1
, *new_path2
;
1062 new_path1
= unique_path(path
, branch1
);
1063 new_path2
= unique_path(path
, branch2
);
1064 output("CONFLICT (add/add): File %s added non-identically "
1065 "in both branches. Adding as %s and %s instead.",
1066 path
, new_path1
, new_path2
);
1067 remove_file(0, path
);
1068 update_file(0, a_sha
, a_mode
, new_path1
);
1069 update_file(0, b_sha
, b_mode
, new_path2
);
1072 } else if (o_sha
&& a_sha
&& b_sha
) {
1073 /* case D: Modified in both, but differently. */
1074 struct merge_file_info mfi
;
1075 struct diff_filespec o
, a
, b
;
1077 output("Auto-merging %s", path
);
1078 o
.path
= a
.path
= b
.path
= (char *)path
;
1079 memcpy(o
.sha1
, o_sha
, 20);
1081 memcpy(a
.sha1
, a_sha
, 20);
1083 memcpy(b
.sha1
, b_sha
, 20);
1086 mfi
= merge_file(&o
, &a
, &b
,
1090 update_file(1, mfi
.sha
, mfi
.mode
, path
);
1093 output("CONFLICT (content): Merge conflict in %s", path
);
1096 update_file(0, mfi
.sha
, mfi
.mode
, path
);
1098 update_file_flags(mfi
.sha
, mfi
.mode
, path
,
1099 0 /* update_cache */, 1 /* update_working_directory */);
1102 die("Fatal merge failure, shouldn't happen.");
1110 static int merge_trees(struct tree
*head
,
1112 struct tree
*common
,
1113 const char *branch1
,
1114 const char *branch2
,
1115 struct tree
**result
)
1118 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1119 output("Already uptodate!");
1124 code
= git_merge_trees(index_only
? "-i": "-u", common
, head
, merge
);
1127 die("merging of trees %s and %s failed",
1128 sha1_to_hex(head
->object
.sha1
),
1129 sha1_to_hex(merge
->object
.sha1
));
1131 *result
= git_write_tree();
1134 struct path_list
*entries
, *re_head
, *re_merge
;
1136 path_list_clear(¤t_file_set
, 1);
1137 path_list_clear(¤t_directory_set
, 1);
1138 get_files_dirs(head
);
1139 get_files_dirs(merge
);
1141 entries
= get_unmerged();
1142 re_head
= get_renames(head
, common
, head
, merge
, entries
);
1143 re_merge
= get_renames(merge
, common
, head
, merge
, entries
);
1144 clean
= process_renames(re_head
, re_merge
,
1146 for (i
= 0; i
< entries
->nr
; i
++) {
1147 const char *path
= entries
->items
[i
].path
;
1148 struct stage_data
*e
= entries
->items
[i
].util
;
1151 if (!process_entry(path
, e
, branch1
, branch2
))
1155 path_list_clear(re_merge
, 0);
1156 path_list_clear(re_head
, 0);
1157 path_list_clear(entries
, 1);
1159 if (clean
|| index_only
)
1160 *result
= git_write_tree();
1165 printf("merging of trees %s and %s resulted in %s\n",
1166 sha1_to_hex(head
->object
.sha1
),
1167 sha1_to_hex(merge
->object
.sha1
),
1168 sha1_to_hex((*result
)->object
.sha1
));
1175 * Merge the commits h1 and h2, return the resulting virtual
1176 * commit object and a flag indicating the cleaness of the merge.
1179 int merge(struct commit
*h1
,
1181 const char *branch1
,
1182 const char *branch2
,
1183 int call_depth
/* =0 */,
1184 struct commit
*ancestor
/* =None */,
1185 struct commit
**result
)
1187 struct commit_list
*ca
= NULL
, *iter
;
1188 struct commit
*merged_common_ancestors
;
1189 struct tree
*mrtree
;
1193 output_commit_title(h1
);
1194 output_commit_title(h2
);
1197 commit_list_insert(ancestor
, &ca
);
1199 ca
= get_merge_bases(h1
, h2
, 1);
1201 output("found %u common ancestor(s):", commit_list_count(ca
));
1202 for (iter
= ca
; iter
; iter
= iter
->next
)
1203 output_commit_title(iter
->item
);
1205 merged_common_ancestors
= pop_commit(&ca
);
1207 for (iter
= ca
; iter
; iter
= iter
->next
) {
1208 output_indent
= call_depth
+ 1;
1210 * When the merge fails, the result contains files
1211 * with conflict markers. The cleanness flag is
1212 * ignored, it was never acutally used, as result of
1213 * merge_trees has always overwritten it: the commited
1214 * "conflicts" were already resolved.
1216 merge(merged_common_ancestors
, iter
->item
,
1217 "Temporary merge branch 1",
1218 "Temporary merge branch 2",
1221 &merged_common_ancestors
);
1222 output_indent
= call_depth
;
1224 if (!merged_common_ancestors
)
1225 die("merge returned no commit");
1228 if (call_depth
== 0) {
1229 setup_index(0 /* $GIT_DIR/index */);
1232 setup_index(1 /* temporary index */);
1233 git_read_tree(h1
->tree
);
1237 clean
= merge_trees(h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1238 branch1
, branch2
, &mrtree
);
1240 if (!ancestor
&& (clean
|| index_only
)) {
1241 *result
= make_virtual_commit(mrtree
, "merged tree");
1242 commit_list_insert(h1
, &(*result
)->parents
);
1243 commit_list_insert(h2
, &(*result
)->parents
->next
);
1250 static struct commit
*get_ref(const char *ref
)
1252 unsigned char sha1
[20];
1253 struct object
*object
;
1255 if (get_sha1(ref
, sha1
))
1256 die("Could not resolve ref '%s'", ref
);
1257 object
= deref_tag(parse_object(sha1
), ref
, strlen(ref
));
1258 if (object
->type
!= OBJ_COMMIT
)
1260 if (parse_commit((struct commit
*)object
))
1261 die("Could not parse commit '%s'", sha1_to_hex(object
->sha1
));
1262 return (struct commit
*)object
;
1265 int main(int argc
, char *argv
[])
1267 static const char *bases
[2];
1268 static unsigned bases_count
= 0;
1270 const char *branch1
, *branch2
;
1271 struct commit
*result
, *h1
, *h2
;
1273 original_index_file
= getenv("GIT_INDEX_FILE");
1275 if (!original_index_file
)
1276 original_index_file
= strdup(git_path("index"));
1278 temporary_index_file
= strdup(git_path("mrg-rcrsv-tmp-idx"));
1281 die("Usage: %s <base>... -- <head> <remote> ...\n", argv
[0]);
1283 for (i
= 1; i
< argc
; ++i
) {
1284 if (!strcmp(argv
[i
], "--"))
1286 if (bases_count
< sizeof(bases
)/sizeof(*bases
))
1287 bases
[bases_count
++] = argv
[i
];
1289 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
1290 die("Not handling anything other than two heads merge.");
1292 branch1
= argv
[++i
];
1293 branch2
= argv
[++i
];
1294 printf("Merging %s with %s\n", branch1
, branch2
);
1296 h1
= get_ref(branch1
);
1297 h2
= get_ref(branch2
);
1299 if (bases_count
== 1) {
1300 struct commit
*ancestor
= get_ref(bases
[0]);
1301 clean
= merge(h1
, h2
, branch1
, branch2
, 0, ancestor
, &result
);
1303 clean
= merge(h1
, h2
, branch1
, branch2
, 0, NULL
, &result
);
1308 return clean
? 0: 1;