2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
8 #include "cache-tree.h"
12 #include "tree-walk.h"
16 #include "unpack-trees.h"
17 #include "string-list.h"
18 #include "xdiff-interface.h"
21 #include "merge-recursive.h"
24 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
25 const char *subtree_shift
)
27 unsigned char shifted
[20];
29 if (!*subtree_shift
) {
30 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 0);
32 shift_tree_by(one
->object
.sha1
, two
->object
.sha1
, shifted
,
35 if (!hashcmp(two
->object
.sha1
, shifted
))
37 return lookup_tree(shifted
);
41 * A virtual commit has (const char *)commit->util set to the name.
44 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
46 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
48 commit
->util
= (void*)comment
;
50 commit
->object
.parsed
= 1;
55 * Since we use get_tree_entry(), which does not put the read object into
56 * the object pool, we cannot rely on a == b.
58 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
62 return a
&& b
&& hashcmp(a
, b
) == 0;
66 * Since we want to write the index eventually, we cannot reuse the index
67 * for these (temporary) data.
74 unsigned char sha
[20];
79 static int show(struct merge_options
*o
, int v
)
81 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
84 static void flush_output(struct merge_options
*o
)
87 fputs(o
->obuf
.buf
, stdout
);
88 strbuf_reset(&o
->obuf
);
92 __attribute__((format (printf
, 3, 4)))
93 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
101 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
102 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
103 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
106 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
111 if (len
>= strbuf_avail(&o
->obuf
)) {
112 strbuf_grow(&o
->obuf
, len
+ 2);
114 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
116 if (len
>= strbuf_avail(&o
->obuf
)) {
117 die("this should not happen, your snprintf is broken");
120 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ len
);
121 strbuf_add(&o
->obuf
, "\n", 1);
122 if (!o
->buffer_output
)
126 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
130 for (i
= o
->call_depth
; i
--;)
133 printf("virtual %s\n", (char *)commit
->util
);
135 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
136 if (parse_commit(commit
) != 0)
137 printf("(bad commit)\n");
141 for (s
= commit
->buffer
; *s
; s
++)
142 if (*s
== '\n' && s
[1] == '\n') {
146 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
148 printf("%.*s\n", len
, s
);
153 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
154 const char *path
, int stage
, int refresh
, int options
)
156 struct cache_entry
*ce
;
157 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
159 return error("addinfo_cache failed for path '%s'", path
);
160 return add_cache_entry(ce
, options
);
163 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
166 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
169 static int git_merge_trees(int index_only
,
175 struct tree_desc t
[3];
176 struct unpack_trees_options opts
;
178 memset(&opts
, 0, sizeof(opts
));
185 opts
.fn
= threeway_merge
;
186 opts
.src_index
= &the_index
;
187 opts
.dst_index
= &the_index
;
188 setup_unpack_trees_porcelain(&opts
, "merge");
190 init_tree_desc_from_tree(t
+0, common
);
191 init_tree_desc_from_tree(t
+1, head
);
192 init_tree_desc_from_tree(t
+2, merge
);
194 rc
= unpack_trees(3, t
, &opts
);
195 cache_tree_free(&active_cache_tree
);
199 struct tree
*write_tree_from_memory(struct merge_options
*o
)
201 struct tree
*result
= NULL
;
203 if (unmerged_cache()) {
205 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
206 for (i
= 0; i
< active_nr
; i
++) {
207 struct cache_entry
*ce
= active_cache
[i
];
209 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
210 (int)ce_namelen(ce
), ce
->name
);
212 die("Bug in merge-recursive.c");
215 if (!active_cache_tree
)
216 active_cache_tree
= cache_tree();
218 if (!cache_tree_fully_valid(active_cache_tree
) &&
219 cache_tree_update(active_cache_tree
,
220 active_cache
, active_nr
, 0, 0) < 0)
221 die("error building trees");
223 result
= lookup_tree(active_cache_tree
->sha1
);
228 static int save_files_dirs(const unsigned char *sha1
,
229 const char *base
, int baselen
, const char *path
,
230 unsigned int mode
, int stage
, void *context
)
232 int len
= strlen(path
);
233 char *newpath
= xmalloc(baselen
+ len
+ 1);
234 struct merge_options
*o
= context
;
236 memcpy(newpath
, base
, baselen
);
237 memcpy(newpath
+ baselen
, path
, len
);
238 newpath
[baselen
+ len
] = '\0';
241 string_list_insert(&o
->current_directory_set
, newpath
);
243 string_list_insert(&o
->current_file_set
, newpath
);
246 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
249 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
252 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
254 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
259 * Returns an index_entry instance which doesn't have to correspond to
260 * a real cache entry in Git's index.
262 static struct stage_data
*insert_stage_data(const char *path
,
263 struct tree
*o
, struct tree
*a
, struct tree
*b
,
264 struct string_list
*entries
)
266 struct string_list_item
*item
;
267 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
268 get_tree_entry(o
->object
.sha1
, path
,
269 e
->stages
[1].sha
, &e
->stages
[1].mode
);
270 get_tree_entry(a
->object
.sha1
, path
,
271 e
->stages
[2].sha
, &e
->stages
[2].mode
);
272 get_tree_entry(b
->object
.sha1
, path
,
273 e
->stages
[3].sha
, &e
->stages
[3].mode
);
274 item
= string_list_insert(entries
, path
);
280 * Create a dictionary mapping file names to stage_data objects. The
281 * dictionary contains one entry for every path with a non-zero stage entry.
283 static struct string_list
*get_unmerged(void)
285 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
288 unmerged
->strdup_strings
= 1;
290 for (i
= 0; i
< active_nr
; i
++) {
291 struct string_list_item
*item
;
292 struct stage_data
*e
;
293 struct cache_entry
*ce
= active_cache
[i
];
297 item
= string_list_lookup(unmerged
, ce
->name
);
299 item
= string_list_insert(unmerged
, ce
->name
);
300 item
->util
= xcalloc(1, sizeof(struct stage_data
));
303 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
304 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
312 struct diff_filepair
*pair
;
313 struct stage_data
*src_entry
;
314 struct stage_data
*dst_entry
;
315 unsigned processed
:1;
319 * Get information of all renames which occurred between 'o_tree' and
320 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
321 * 'b_tree') to be able to associate the correct cache entries with
322 * the rename information. 'tree' is always equal to either a_tree or b_tree.
324 static struct string_list
*get_renames(struct merge_options
*o
,
329 struct string_list
*entries
)
332 struct string_list
*renames
;
333 struct diff_options opts
;
335 renames
= xcalloc(1, sizeof(struct string_list
));
337 DIFF_OPT_SET(&opts
, RECURSIVE
);
338 opts
.detect_rename
= DIFF_DETECT_RENAME
;
339 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
340 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
342 opts
.warn_on_too_large_rename
= 1;
343 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
344 if (diff_setup_done(&opts
) < 0)
345 die("diff setup failed");
346 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
348 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
349 struct string_list_item
*item
;
351 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
352 if (pair
->status
!= 'R') {
353 diff_free_filepair(pair
);
356 re
= xmalloc(sizeof(*re
));
359 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
361 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
362 o_tree
, a_tree
, b_tree
, entries
);
364 re
->src_entry
= item
->util
;
366 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
368 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
369 o_tree
, a_tree
, b_tree
, entries
);
371 re
->dst_entry
= item
->util
;
372 item
= string_list_insert(renames
, pair
->one
->path
);
375 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
376 diff_queued_diff
.nr
= 0;
381 static int update_stages(const char *path
, struct diff_filespec
*o
,
382 struct diff_filespec
*a
, struct diff_filespec
*b
,
385 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
387 if (remove_file_from_cache(path
))
390 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
393 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
396 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
401 static int remove_file(struct merge_options
*o
, int clean
,
402 const char *path
, int no_wd
)
404 int update_cache
= o
->call_depth
|| clean
;
405 int update_working_directory
= !o
->call_depth
&& !no_wd
;
408 if (remove_file_from_cache(path
))
411 if (update_working_directory
) {
412 if (remove_path(path
))
418 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
420 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
423 char *p
= newpath
+ strlen(path
);
424 strcpy(newpath
, path
);
430 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
431 string_list_has_string(&o
->current_directory_set
, newpath
) ||
432 lstat(newpath
, &st
) == 0)
433 sprintf(p
, "_%d", suffix
++);
435 string_list_insert(&o
->current_file_set
, newpath
);
439 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
442 long ret
= write_in_full(fd
, buf
, size
);
447 die_errno("merge-recursive");
449 die("merge-recursive: disk full?");
456 static int would_lose_untracked(const char *path
)
458 int pos
= cache_name_pos(path
, strlen(path
));
462 while (pos
< active_nr
&&
463 !strcmp(path
, active_cache
[pos
]->name
)) {
465 * If stage #0, it is definitely tracked.
466 * If it has stage #2 then it was tracked
467 * before this merge started. All other
468 * cases the path was not tracked.
470 switch (ce_stage(active_cache
[pos
])) {
477 return file_exists(path
);
480 static int make_room_for_path(const char *path
)
483 const char *msg
= "failed to create path '%s'%s";
485 status
= safe_create_leading_directories_const(path
);
488 /* something else exists */
489 error(msg
, path
, ": perhaps a D/F conflict?");
496 * Do not unlink a file in the work tree if we are not
499 if (would_lose_untracked(path
))
500 return error("refusing to lose untracked file at '%s'",
503 /* Successful unlink is good.. */
506 /* .. and so is no existing file */
509 /* .. but not some other error (who really cares what?) */
510 return error(msg
, path
, ": perhaps a D/F conflict?");
513 static void update_file_flags(struct merge_options
*o
,
514 const unsigned char *sha
,
524 enum object_type type
;
528 if (S_ISGITLINK(mode
))
530 * We may later decide to recursively descend into
531 * the submodule directory and update its index
532 * and/or work tree, but we do not do that now.
536 buf
= read_sha1_file(sha
, &type
, &size
);
538 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
539 if (type
!= OBJ_BLOB
)
540 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
542 struct strbuf strbuf
= STRBUF_INIT
;
543 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
546 buf
= strbuf_detach(&strbuf
, NULL
);
550 if (make_room_for_path(path
) < 0) {
555 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
561 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
563 die_errno("failed to open '%s'", path
);
564 flush_buffer(fd
, buf
, size
);
566 } else if (S_ISLNK(mode
)) {
567 char *lnk
= xmemdupz(buf
, size
);
568 safe_create_leading_directories_const(path
);
570 if (symlink(lnk
, path
))
571 die_errno("failed to symlink '%s'", path
);
574 die("do not know what to do with %06o %s '%s'",
575 mode
, sha1_to_hex(sha
), path
);
580 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
583 static void update_file(struct merge_options
*o
,
585 const unsigned char *sha
,
589 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
592 /* Low level file merging, update and removal */
594 struct merge_file_info
596 unsigned char sha
[20];
602 static int merge_3way(struct merge_options
*o
,
603 mmbuffer_t
*result_buf
,
604 struct diff_filespec
*one
,
605 struct diff_filespec
*a
,
606 struct diff_filespec
*b
,
610 mmfile_t orig
, src1
, src2
;
611 char *base_name
, *name1
, *name2
;
618 switch (o
->recursive_variant
) {
619 case MERGE_RECURSIVE_OURS
:
620 favor
= XDL_MERGE_FAVOR_OURS
;
622 case MERGE_RECURSIVE_THEIRS
:
623 favor
= XDL_MERGE_FAVOR_THEIRS
;
631 if (strcmp(a
->path
, b
->path
) ||
632 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
633 base_name
= o
->ancestor
== NULL
? NULL
:
634 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
635 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
636 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
638 base_name
= o
->ancestor
== NULL
? NULL
:
639 xstrdup(mkpath("%s", o
->ancestor
));
640 name1
= xstrdup(mkpath("%s", branch1
));
641 name2
= xstrdup(mkpath("%s", branch2
));
644 read_mmblob(&orig
, one
->sha1
);
645 read_mmblob(&src1
, a
->sha1
);
646 read_mmblob(&src2
, b
->sha1
);
648 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
649 &src1
, name1
, &src2
, name2
,
650 (!!o
->call_depth
) | (favor
<< 1));
660 static struct merge_file_info
merge_file(struct merge_options
*o
,
661 struct diff_filespec
*one
,
662 struct diff_filespec
*a
,
663 struct diff_filespec
*b
,
667 struct merge_file_info result
;
671 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
673 if (S_ISREG(a
->mode
)) {
674 result
.mode
= a
->mode
;
675 hashcpy(result
.sha
, a
->sha1
);
677 result
.mode
= b
->mode
;
678 hashcpy(result
.sha
, b
->sha1
);
681 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
687 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
688 result
.mode
= b
->mode
;
690 result
.mode
= a
->mode
;
691 if (b
->mode
!= one
->mode
) {
697 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
698 hashcpy(result
.sha
, b
->sha1
);
699 else if (sha_eq(b
->sha1
, one
->sha1
))
700 hashcpy(result
.sha
, a
->sha1
);
701 else if (S_ISREG(a
->mode
)) {
702 mmbuffer_t result_buf
;
705 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
708 if ((merge_status
< 0) || !result_buf
.ptr
)
709 die("Failed to execute internal merge");
711 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
712 blob_type
, result
.sha
))
713 die("Unable to add %s to database",
716 free(result_buf
.ptr
);
717 result
.clean
= (merge_status
== 0);
718 } else if (S_ISGITLINK(a
->mode
)) {
720 hashcpy(result
.sha
, a
->sha1
);
721 } else if (S_ISLNK(a
->mode
)) {
722 hashcpy(result
.sha
, a
->sha1
);
724 if (!sha_eq(a
->sha1
, b
->sha1
))
727 die("unsupported object type in the tree");
734 static void conflict_rename_rename(struct merge_options
*o
,
742 const char *ren1_dst
= ren1
->pair
->two
->path
;
743 const char *ren2_dst
= ren2
->pair
->two
->path
;
744 const char *dst_name1
= ren1_dst
;
745 const char *dst_name2
= ren2_dst
;
746 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
747 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
748 output(o
, 1, "%s is a directory in %s adding as %s instead",
749 ren1_dst
, branch2
, dst_name1
);
750 remove_file(o
, 0, ren1_dst
, 0);
752 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
753 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
754 output(o
, 1, "%s is a directory in %s adding as %s instead",
755 ren2_dst
, branch1
, dst_name2
);
756 remove_file(o
, 0, ren2_dst
, 0);
759 remove_file_from_cache(dst_name1
);
760 remove_file_from_cache(dst_name2
);
762 * Uncomment to leave the conflicting names in the resulting tree
764 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
765 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
768 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
769 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
775 static void conflict_rename_dir(struct merge_options
*o
,
779 char *new_path
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
780 output(o
, 1, "Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
781 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
782 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
786 static void conflict_rename_rename_2(struct merge_options
*o
,
792 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
793 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
794 output(o
, 1, "Renaming %s to %s and %s to %s instead",
795 ren1
->pair
->one
->path
, new_path1
,
796 ren2
->pair
->one
->path
, new_path2
);
797 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
798 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
799 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
804 static int process_renames(struct merge_options
*o
,
805 struct string_list
*a_renames
,
806 struct string_list
*b_renames
)
808 int clean_merge
= 1, i
, j
;
809 struct string_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
810 const struct rename
*sre
;
812 for (i
= 0; i
< a_renames
->nr
; i
++) {
813 sre
= a_renames
->items
[i
].util
;
814 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
817 for (i
= 0; i
< b_renames
->nr
; i
++) {
818 sre
= b_renames
->items
[i
].util
;
819 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
823 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
825 struct string_list
*renames1
, *renames2Dst
;
826 struct rename
*ren1
= NULL
, *ren2
= NULL
;
827 const char *branch1
, *branch2
;
828 const char *ren1_src
, *ren1_dst
;
830 if (i
>= a_renames
->nr
) {
831 ren2
= b_renames
->items
[j
++].util
;
832 } else if (j
>= b_renames
->nr
) {
833 ren1
= a_renames
->items
[i
++].util
;
835 int compare
= strcmp(a_renames
->items
[i
].string
,
836 b_renames
->items
[j
].string
);
838 ren1
= a_renames
->items
[i
++].util
;
840 ren2
= b_renames
->items
[j
++].util
;
843 /* TODO: refactor, so that 1/2 are not needed */
845 renames1
= a_renames
;
846 renames2Dst
= &b_by_dst
;
847 branch1
= o
->branch1
;
848 branch2
= o
->branch2
;
851 renames1
= b_renames
;
852 renames2Dst
= &a_by_dst
;
853 branch1
= o
->branch2
;
854 branch2
= o
->branch1
;
859 src
= ren1
->pair
->one
->path
;
861 ren1
->dst_entry
->processed
= 1;
862 ren1
->src_entry
->processed
= 1;
868 ren1_src
= ren1
->pair
->one
->path
;
869 ren1_dst
= ren1
->pair
->two
->path
;
872 const char *ren2_src
= ren2
->pair
->one
->path
;
873 const char *ren2_dst
= ren2
->pair
->two
->path
;
874 /* Renamed in 1 and renamed in 2 */
875 if (strcmp(ren1_src
, ren2_src
) != 0)
876 die("ren1.src != ren2.src");
877 ren2
->dst_entry
->processed
= 1;
879 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
881 output(o
, 1, "CONFLICT (rename/rename): "
882 "Rename \"%s\"->\"%s\" in branch \"%s\" "
883 "rename \"%s\"->\"%s\" in \"%s\"%s",
884 src
, ren1_dst
, branch1
,
885 src
, ren2_dst
, branch2
,
886 o
->call_depth
? " (left unresolved)": "");
888 remove_file_from_cache(src
);
889 update_file(o
, 0, ren1
->pair
->one
->sha1
,
890 ren1
->pair
->one
->mode
, src
);
892 conflict_rename_rename(o
, ren1
, branch1
, ren2
, branch2
);
894 struct merge_file_info mfi
;
895 remove_file(o
, 1, ren1_src
, 1);
902 if (mfi
.merge
|| !mfi
.clean
)
903 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
906 output(o
, 2, "Auto-merging %s", ren1_dst
);
909 output(o
, 1, "CONFLICT (content): merge conflict in %s",
914 update_stages(ren1_dst
,
920 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
923 /* Renamed in 1, maybe changed in 2 */
924 struct string_list_item
*item
;
925 /* we only use sha1 and mode of these */
926 struct diff_filespec src_other
, dst_other
;
927 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
929 remove_file(o
, 1, ren1_src
, o
->call_depth
|| stage
== 3);
931 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
932 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
933 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
934 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
938 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
940 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
941 " directory %s added in %s",
942 ren1_src
, ren1_dst
, branch1
,
944 conflict_rename_dir(o
, ren1
, branch1
);
945 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
947 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
949 ren1_src
, ren1_dst
, branch1
,
951 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
953 update_stages(ren1_dst
, NULL
,
954 branch1
== o
->branch1
?
955 ren1
->pair
->two
: NULL
,
956 branch1
== o
->branch1
?
957 NULL
: ren1
->pair
->two
, 1);
958 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
959 const char *new_path
;
962 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
964 ren1_src
, ren1_dst
, branch1
,
967 struct merge_file_info mfi
;
968 struct diff_filespec one
, a
, b
;
970 one
.path
= a
.path
= b
.path
=
972 hashcpy(one
.sha1
, null_sha1
);
974 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
975 a
.mode
= ren1
->pair
->two
->mode
;
976 hashcpy(b
.sha1
, dst_other
.sha1
);
977 b
.mode
= dst_other
.mode
;
978 mfi
= merge_file(o
, &one
, &a
, &b
,
981 output(o
, 1, "Adding merged %s", ren1_dst
);
987 new_path
= unique_path(o
, ren1_dst
, branch2
);
988 output(o
, 1, "Adding as %s instead", new_path
);
989 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
991 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
995 output(o
, 1, "CONFLICT (rename/rename): "
996 "Rename %s->%s in %s. "
997 "Rename %s->%s in %s",
998 ren1_src
, ren1_dst
, branch1
,
999 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1000 conflict_rename_rename_2(o
, ren1
, branch1
, ren2
, branch2
);
1005 struct diff_filespec
*one
, *a
, *b
;
1006 struct merge_file_info mfi
;
1007 src_other
.path
= (char *)ren1_src
;
1009 one
= ren1
->pair
->one
;
1010 if (a_renames
== renames1
) {
1011 a
= ren1
->pair
->two
;
1014 b
= ren1
->pair
->two
;
1017 mfi
= merge_file(o
, one
, a
, b
,
1018 o
->branch1
, o
->branch2
);
1021 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1022 mfi
.mode
== ren1
->pair
->two
->mode
)
1024 * This messaged is part of
1025 * t6022 test. If you change
1026 * it update the test too.
1028 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1030 if (mfi
.merge
|| !mfi
.clean
)
1031 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1033 output(o
, 2, "Auto-merging %s", ren1_dst
);
1035 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1040 update_stages(ren1_dst
,
1043 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1048 string_list_clear(&a_by_dst
, 0);
1049 string_list_clear(&b_by_dst
, 0);
1054 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1056 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1059 /* Per entry merge function */
1060 static int process_entry(struct merge_options
*o
,
1061 const char *path
, struct stage_data
*entry
)
1064 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1065 print_index_entry("\tpath: ", entry);
1067 int clean_merge
= 1;
1068 unsigned o_mode
= entry
->stages
[1].mode
;
1069 unsigned a_mode
= entry
->stages
[2].mode
;
1070 unsigned b_mode
= entry
->stages
[3].mode
;
1071 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1072 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1073 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1075 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1076 /* Case A: Deleted in one */
1077 if ((!a_sha
&& !b_sha
) ||
1078 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1079 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1080 /* Deleted in both or deleted in one and
1081 * unchanged in the other */
1083 output(o
, 2, "Removing %s", path
);
1084 /* do not touch working file if it did not exist */
1085 remove_file(o
, 1, path
, !a_sha
);
1087 /* Deleted in one and changed in the other */
1090 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1091 "and modified in %s. Version %s of %s left in tree.",
1093 o
->branch2
, o
->branch2
, path
);
1094 update_file(o
, 0, b_sha
, b_mode
, path
);
1096 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1097 "and modified in %s. Version %s of %s left in tree.",
1099 o
->branch1
, o
->branch1
, path
);
1100 update_file(o
, 0, a_sha
, a_mode
, path
);
1104 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1105 (!o_sha
&& !a_sha
&& b_sha
)) {
1106 /* Case B: Added in one. */
1107 const char *add_branch
;
1108 const char *other_branch
;
1110 const unsigned char *sha
;
1114 add_branch
= o
->branch1
;
1115 other_branch
= o
->branch2
;
1118 conf
= "file/directory";
1120 add_branch
= o
->branch2
;
1121 other_branch
= o
->branch1
;
1124 conf
= "directory/file";
1126 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1127 const char *new_path
= unique_path(o
, path
, add_branch
);
1129 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1131 conf
, path
, other_branch
, path
, new_path
);
1132 remove_file(o
, 0, path
, 0);
1133 update_file(o
, 0, sha
, mode
, new_path
);
1135 output(o
, 2, "Adding %s", path
);
1136 update_file(o
, 1, sha
, mode
, path
);
1138 } else if (a_sha
&& b_sha
) {
1139 /* Case C: Added in both (check for same permissions) and */
1140 /* case D: Modified in both, but differently. */
1141 const char *reason
= "content";
1142 struct merge_file_info mfi
;
1143 struct diff_filespec one
, a
, b
;
1147 o_sha
= (unsigned char *)null_sha1
;
1149 output(o
, 2, "Auto-merging %s", path
);
1150 one
.path
= a
.path
= b
.path
= (char *)path
;
1151 hashcpy(one
.sha1
, o_sha
);
1153 hashcpy(a
.sha1
, a_sha
);
1155 hashcpy(b
.sha1
, b_sha
);
1158 mfi
= merge_file(o
, &one
, &a
, &b
,
1159 o
->branch1
, o
->branch2
);
1161 clean_merge
= mfi
.clean
;
1163 if (S_ISGITLINK(mfi
.mode
))
1164 reason
= "submodule";
1165 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1168 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1169 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1171 * this entry was deleted altogether. a_mode == 0 means
1172 * we had that path and want to actively remove it.
1174 remove_file(o
, 1, path
, !a_mode
);
1176 die("Fatal merge failure, shouldn't happen.");
1181 int merge_trees(struct merge_options
*o
,
1184 struct tree
*common
,
1185 struct tree
**result
)
1189 if (o
->subtree_shift
) {
1190 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1191 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1194 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1195 output(o
, 0, "Already up-to-date!");
1200 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1203 if (show(o
, 4) || o
->call_depth
)
1204 die("merging of trees %s and %s failed",
1205 sha1_to_hex(head
->object
.sha1
),
1206 sha1_to_hex(merge
->object
.sha1
));
1211 if (unmerged_cache()) {
1212 struct string_list
*entries
, *re_head
, *re_merge
;
1214 string_list_clear(&o
->current_file_set
, 1);
1215 string_list_clear(&o
->current_directory_set
, 1);
1216 get_files_dirs(o
, head
);
1217 get_files_dirs(o
, merge
);
1219 entries
= get_unmerged();
1220 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1221 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1222 clean
= process_renames(o
, re_head
, re_merge
);
1223 for (i
= 0; i
< entries
->nr
; i
++) {
1224 const char *path
= entries
->items
[i
].string
;
1225 struct stage_data
*e
= entries
->items
[i
].util
;
1227 && !process_entry(o
, path
, e
))
1231 string_list_clear(re_merge
, 0);
1232 string_list_clear(re_head
, 0);
1233 string_list_clear(entries
, 1);
1240 *result
= write_tree_from_memory(o
);
1245 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1247 struct commit_list
*next
= NULL
, *current
, *backup
;
1248 for (current
= list
; current
; current
= backup
) {
1249 backup
= current
->next
;
1250 current
->next
= next
;
1257 * Merge the commits h1 and h2, return the resulting virtual
1258 * commit object and a flag indicating the cleanness of the merge.
1260 int merge_recursive(struct merge_options
*o
,
1263 struct commit_list
*ca
,
1264 struct commit
**result
)
1266 struct commit_list
*iter
;
1267 struct commit
*merged_common_ancestors
;
1268 struct tree
*mrtree
= mrtree
;
1272 output(o
, 4, "Merging:");
1273 output_commit_title(o
, h1
);
1274 output_commit_title(o
, h2
);
1278 ca
= get_merge_bases(h1
, h2
, 1);
1279 ca
= reverse_commit_list(ca
);
1283 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1284 for (iter
= ca
; iter
; iter
= iter
->next
)
1285 output_commit_title(o
, iter
->item
);
1288 merged_common_ancestors
= pop_commit(&ca
);
1289 if (merged_common_ancestors
== NULL
) {
1290 /* if there is no common ancestor, make an empty tree */
1291 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1293 tree
->object
.parsed
= 1;
1294 tree
->object
.type
= OBJ_TREE
;
1295 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1296 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1299 for (iter
= ca
; iter
; iter
= iter
->next
) {
1300 const char *saved_b1
, *saved_b2
;
1303 * When the merge fails, the result contains files
1304 * with conflict markers. The cleanness flag is
1305 * ignored, it was never actually used, as result of
1306 * merge_trees has always overwritten it: the committed
1307 * "conflicts" were already resolved.
1310 saved_b1
= o
->branch1
;
1311 saved_b2
= o
->branch2
;
1312 o
->branch1
= "Temporary merge branch 1";
1313 o
->branch2
= "Temporary merge branch 2";
1314 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1315 NULL
, &merged_common_ancestors
);
1316 o
->branch1
= saved_b1
;
1317 o
->branch2
= saved_b2
;
1320 if (!merged_common_ancestors
)
1321 die("merge returned no commit");
1328 o
->ancestor
= "merged common ancestors";
1329 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1332 if (o
->call_depth
) {
1333 *result
= make_virtual_commit(mrtree
, "merged tree");
1334 commit_list_insert(h1
, &(*result
)->parents
);
1335 commit_list_insert(h2
, &(*result
)->parents
->next
);
1341 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1343 struct object
*object
;
1345 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1348 if (object
->type
== OBJ_TREE
)
1349 return make_virtual_commit((struct tree
*)object
, name
);
1350 if (object
->type
!= OBJ_COMMIT
)
1352 if (parse_commit((struct commit
*)object
))
1354 return (struct commit
*)object
;
1357 int merge_recursive_generic(struct merge_options
*o
,
1358 const unsigned char *head
,
1359 const unsigned char *merge
,
1361 const unsigned char **base_list
,
1362 struct commit
**result
)
1364 int clean
, index_fd
;
1365 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1366 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1367 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1368 struct commit_list
*ca
= NULL
;
1372 for (i
= 0; i
< num_base_list
; ++i
) {
1373 struct commit
*base
;
1374 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1375 return error("Could not parse object '%s'",
1376 sha1_to_hex(base_list
[i
]));
1377 commit_list_insert(base
, &ca
);
1381 index_fd
= hold_locked_index(lock
, 1);
1382 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1384 if (active_cache_changed
&&
1385 (write_cache(index_fd
, active_cache
, active_nr
) ||
1386 commit_locked_index(lock
)))
1387 return error("Unable to write index.");
1389 return clean
? 0 : 1;
1392 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1394 struct merge_options
*o
= cb
;
1395 if (!strcasecmp(var
, "merge.verbosity")) {
1396 o
->verbosity
= git_config_int(var
, value
);
1399 if (!strcasecmp(var
, "diff.renamelimit")) {
1400 o
->diff_rename_limit
= git_config_int(var
, value
);
1403 if (!strcasecmp(var
, "merge.renamelimit")) {
1404 o
->merge_rename_limit
= git_config_int(var
, value
);
1407 return git_xmerge_config(var
, value
, cb
);
1410 void init_merge_options(struct merge_options
*o
)
1412 memset(o
, 0, sizeof(struct merge_options
));
1414 o
->buffer_output
= 1;
1415 o
->diff_rename_limit
= -1;
1416 o
->merge_rename_limit
= -1;
1417 git_config(merge_recursive_config
, o
);
1418 if (getenv("GIT_MERGE_VERBOSITY"))
1420 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1421 if (o
->verbosity
>= 5)
1422 o
->buffer_output
= 0;
1423 strbuf_init(&o
->obuf
, 0);
1424 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1425 o
->current_file_set
.strdup_strings
= 1;
1426 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1427 o
->current_directory_set
.strdup_strings
= 1;