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"
23 #include "submodule.h"
25 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
26 const char *subtree_shift
)
28 unsigned char shifted
[20];
30 if (!*subtree_shift
) {
31 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 0);
33 shift_tree_by(one
->object
.sha1
, two
->object
.sha1
, shifted
,
36 if (!hashcmp(two
->object
.sha1
, shifted
))
38 return lookup_tree(shifted
);
42 * A virtual commit has (const char *)commit->util set to the name.
45 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
47 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
49 commit
->util
= (void*)comment
;
51 commit
->object
.parsed
= 1;
56 * Since we use get_tree_entry(), which does not put the read object into
57 * the object pool, we cannot rely on a == b.
59 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
63 return a
&& b
&& hashcmp(a
, b
) == 0;
67 * Since we want to write the index eventually, we cannot reuse the index
68 * for these (temporary) data.
75 unsigned char sha
[20];
80 static int show(struct merge_options
*o
, int v
)
82 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
85 static void flush_output(struct merge_options
*o
)
88 fputs(o
->obuf
.buf
, stdout
);
89 strbuf_reset(&o
->obuf
);
93 __attribute__((format (printf
, 3, 4)))
94 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
102 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
103 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
104 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
107 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
112 if (len
>= strbuf_avail(&o
->obuf
)) {
113 strbuf_grow(&o
->obuf
, len
+ 2);
115 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
117 if (len
>= strbuf_avail(&o
->obuf
)) {
118 die("this should not happen, your snprintf is broken");
121 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ len
);
122 strbuf_add(&o
->obuf
, "\n", 1);
123 if (!o
->buffer_output
)
127 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
131 for (i
= o
->call_depth
; i
--;)
134 printf("virtual %s\n", (char *)commit
->util
);
136 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
137 if (parse_commit(commit
) != 0)
138 printf("(bad commit)\n");
141 int len
= find_commit_subject(commit
->buffer
, &title
);
143 printf("%.*s\n", len
, title
);
148 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
149 const char *path
, int stage
, int refresh
, int options
)
151 struct cache_entry
*ce
;
152 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
154 return error("addinfo_cache failed for path '%s'", path
);
155 return add_cache_entry(ce
, options
);
158 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
161 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
164 static int git_merge_trees(int index_only
,
170 struct tree_desc t
[3];
171 struct unpack_trees_options opts
;
173 memset(&opts
, 0, sizeof(opts
));
180 opts
.fn
= threeway_merge
;
181 opts
.src_index
= &the_index
;
182 opts
.dst_index
= &the_index
;
183 setup_unpack_trees_porcelain(&opts
, "merge");
185 init_tree_desc_from_tree(t
+0, common
);
186 init_tree_desc_from_tree(t
+1, head
);
187 init_tree_desc_from_tree(t
+2, merge
);
189 rc
= unpack_trees(3, t
, &opts
);
190 cache_tree_free(&active_cache_tree
);
194 struct tree
*write_tree_from_memory(struct merge_options
*o
)
196 struct tree
*result
= NULL
;
198 if (unmerged_cache()) {
200 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
201 for (i
= 0; i
< active_nr
; i
++) {
202 struct cache_entry
*ce
= active_cache
[i
];
204 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
205 (int)ce_namelen(ce
), ce
->name
);
207 die("Bug in merge-recursive.c");
210 if (!active_cache_tree
)
211 active_cache_tree
= cache_tree();
213 if (!cache_tree_fully_valid(active_cache_tree
) &&
214 cache_tree_update(active_cache_tree
,
215 active_cache
, active_nr
, 0, 0) < 0)
216 die("error building trees");
218 result
= lookup_tree(active_cache_tree
->sha1
);
223 static int save_files_dirs(const unsigned char *sha1
,
224 const char *base
, int baselen
, const char *path
,
225 unsigned int mode
, int stage
, void *context
)
227 int len
= strlen(path
);
228 char *newpath
= xmalloc(baselen
+ len
+ 1);
229 struct merge_options
*o
= context
;
231 memcpy(newpath
, base
, baselen
);
232 memcpy(newpath
+ baselen
, path
, len
);
233 newpath
[baselen
+ len
] = '\0';
236 string_list_insert(&o
->current_directory_set
, newpath
);
238 string_list_insert(&o
->current_file_set
, newpath
);
241 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
244 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
247 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
249 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
254 * Returns an index_entry instance which doesn't have to correspond to
255 * a real cache entry in Git's index.
257 static struct stage_data
*insert_stage_data(const char *path
,
258 struct tree
*o
, struct tree
*a
, struct tree
*b
,
259 struct string_list
*entries
)
261 struct string_list_item
*item
;
262 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
263 get_tree_entry(o
->object
.sha1
, path
,
264 e
->stages
[1].sha
, &e
->stages
[1].mode
);
265 get_tree_entry(a
->object
.sha1
, path
,
266 e
->stages
[2].sha
, &e
->stages
[2].mode
);
267 get_tree_entry(b
->object
.sha1
, path
,
268 e
->stages
[3].sha
, &e
->stages
[3].mode
);
269 item
= string_list_insert(entries
, path
);
275 * Create a dictionary mapping file names to stage_data objects. The
276 * dictionary contains one entry for every path with a non-zero stage entry.
278 static struct string_list
*get_unmerged(void)
280 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
283 unmerged
->strdup_strings
= 1;
285 for (i
= 0; i
< active_nr
; i
++) {
286 struct string_list_item
*item
;
287 struct stage_data
*e
;
288 struct cache_entry
*ce
= active_cache
[i
];
292 item
= string_list_lookup(unmerged
, ce
->name
);
294 item
= string_list_insert(unmerged
, ce
->name
);
295 item
->util
= xcalloc(1, sizeof(struct stage_data
));
298 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
299 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
307 struct diff_filepair
*pair
;
308 struct stage_data
*src_entry
;
309 struct stage_data
*dst_entry
;
310 unsigned processed
:1;
314 * Get information of all renames which occurred between 'o_tree' and
315 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
316 * 'b_tree') to be able to associate the correct cache entries with
317 * the rename information. 'tree' is always equal to either a_tree or b_tree.
319 static struct string_list
*get_renames(struct merge_options
*o
,
324 struct string_list
*entries
)
327 struct string_list
*renames
;
328 struct diff_options opts
;
330 renames
= xcalloc(1, sizeof(struct string_list
));
332 DIFF_OPT_SET(&opts
, RECURSIVE
);
333 opts
.detect_rename
= DIFF_DETECT_RENAME
;
334 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
335 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
337 opts
.warn_on_too_large_rename
= 1;
338 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
339 if (diff_setup_done(&opts
) < 0)
340 die("diff setup failed");
341 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
343 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
344 struct string_list_item
*item
;
346 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
347 if (pair
->status
!= 'R') {
348 diff_free_filepair(pair
);
351 re
= xmalloc(sizeof(*re
));
354 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
356 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
357 o_tree
, a_tree
, b_tree
, entries
);
359 re
->src_entry
= item
->util
;
361 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
363 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
364 o_tree
, a_tree
, b_tree
, entries
);
366 re
->dst_entry
= item
->util
;
367 item
= string_list_insert(renames
, pair
->one
->path
);
370 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
371 diff_queued_diff
.nr
= 0;
376 static int update_stages(const char *path
, struct diff_filespec
*o
,
377 struct diff_filespec
*a
, struct diff_filespec
*b
,
380 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
382 if (remove_file_from_cache(path
))
385 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
388 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
391 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
396 static int remove_file(struct merge_options
*o
, int clean
,
397 const char *path
, int no_wd
)
399 int update_cache
= o
->call_depth
|| clean
;
400 int update_working_directory
= !o
->call_depth
&& !no_wd
;
403 if (remove_file_from_cache(path
))
406 if (update_working_directory
) {
407 if (remove_path(path
))
413 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
415 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
418 char *p
= newpath
+ strlen(path
);
419 strcpy(newpath
, path
);
425 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
426 string_list_has_string(&o
->current_directory_set
, newpath
) ||
427 lstat(newpath
, &st
) == 0)
428 sprintf(p
, "_%d", suffix
++);
430 string_list_insert(&o
->current_file_set
, newpath
);
434 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
437 long ret
= write_in_full(fd
, buf
, size
);
442 die_errno("merge-recursive");
444 die("merge-recursive: disk full?");
451 static int would_lose_untracked(const char *path
)
453 int pos
= cache_name_pos(path
, strlen(path
));
457 while (pos
< active_nr
&&
458 !strcmp(path
, active_cache
[pos
]->name
)) {
460 * If stage #0, it is definitely tracked.
461 * If it has stage #2 then it was tracked
462 * before this merge started. All other
463 * cases the path was not tracked.
465 switch (ce_stage(active_cache
[pos
])) {
472 return file_exists(path
);
475 static int make_room_for_path(const char *path
)
478 const char *msg
= "failed to create path '%s'%s";
480 status
= safe_create_leading_directories_const(path
);
483 /* something else exists */
484 error(msg
, path
, ": perhaps a D/F conflict?");
491 * Do not unlink a file in the work tree if we are not
494 if (would_lose_untracked(path
))
495 return error("refusing to lose untracked file at '%s'",
498 /* Successful unlink is good.. */
501 /* .. and so is no existing file */
504 /* .. but not some other error (who really cares what?) */
505 return error(msg
, path
, ": perhaps a D/F conflict?");
508 static void update_file_flags(struct merge_options
*o
,
509 const unsigned char *sha
,
519 enum object_type type
;
523 if (S_ISGITLINK(mode
)) {
525 * We may later decide to recursively descend into
526 * the submodule directory and update its index
527 * and/or work tree, but we do not do that now.
533 buf
= read_sha1_file(sha
, &type
, &size
);
535 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
536 if (type
!= OBJ_BLOB
)
537 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
539 struct strbuf strbuf
= STRBUF_INIT
;
540 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
543 buf
= strbuf_detach(&strbuf
, NULL
);
547 if (make_room_for_path(path
) < 0) {
552 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
558 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
560 die_errno("failed to open '%s'", path
);
561 flush_buffer(fd
, buf
, size
);
563 } else if (S_ISLNK(mode
)) {
564 char *lnk
= xmemdupz(buf
, size
);
565 safe_create_leading_directories_const(path
);
567 if (symlink(lnk
, path
))
568 die_errno("failed to symlink '%s'", path
);
571 die("do not know what to do with %06o %s '%s'",
572 mode
, sha1_to_hex(sha
), path
);
577 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
580 static void update_file(struct merge_options
*o
,
582 const unsigned char *sha
,
586 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
589 /* Low level file merging, update and removal */
591 struct merge_file_info
593 unsigned char sha
[20];
599 static int merge_3way(struct merge_options
*o
,
600 mmbuffer_t
*result_buf
,
601 struct diff_filespec
*one
,
602 struct diff_filespec
*a
,
603 struct diff_filespec
*b
,
607 mmfile_t orig
, src1
, src2
;
608 char *base_name
, *name1
, *name2
;
615 switch (o
->recursive_variant
) {
616 case MERGE_RECURSIVE_OURS
:
617 favor
= XDL_MERGE_FAVOR_OURS
;
619 case MERGE_RECURSIVE_THEIRS
:
620 favor
= XDL_MERGE_FAVOR_THEIRS
;
628 if (strcmp(a
->path
, b
->path
) ||
629 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
630 base_name
= o
->ancestor
== NULL
? NULL
:
631 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
632 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
633 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
635 base_name
= o
->ancestor
== NULL
? NULL
:
636 xstrdup(mkpath("%s", o
->ancestor
));
637 name1
= xstrdup(mkpath("%s", branch1
));
638 name2
= xstrdup(mkpath("%s", branch2
));
641 read_mmblob(&orig
, one
->sha1
);
642 read_mmblob(&src1
, a
->sha1
);
643 read_mmblob(&src2
, b
->sha1
);
645 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
646 &src1
, name1
, &src2
, name2
,
647 ((o
->call_depth
? LL_OPT_VIRTUAL_ANCESTOR
: 0) |
648 (o
->renormalize
? LL_OPT_RENORMALIZE
: 0) |
649 create_ll_flag(favor
)));
659 static struct merge_file_info
merge_file(struct merge_options
*o
,
660 struct diff_filespec
*one
,
661 struct diff_filespec
*a
,
662 struct diff_filespec
*b
,
666 struct merge_file_info result
;
670 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
672 if (S_ISREG(a
->mode
)) {
673 result
.mode
= a
->mode
;
674 hashcpy(result
.sha
, a
->sha1
);
676 result
.mode
= b
->mode
;
677 hashcpy(result
.sha
, b
->sha1
);
680 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
686 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
687 result
.mode
= b
->mode
;
689 result
.mode
= a
->mode
;
690 if (b
->mode
!= one
->mode
) {
696 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
697 hashcpy(result
.sha
, b
->sha1
);
698 else if (sha_eq(b
->sha1
, one
->sha1
))
699 hashcpy(result
.sha
, a
->sha1
);
700 else if (S_ISREG(a
->mode
)) {
701 mmbuffer_t result_buf
;
704 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
707 if ((merge_status
< 0) || !result_buf
.ptr
)
708 die("Failed to execute internal merge");
710 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
711 blob_type
, result
.sha
))
712 die("Unable to add %s to database",
715 free(result_buf
.ptr
);
716 result
.clean
= (merge_status
== 0);
717 } else if (S_ISGITLINK(a
->mode
)) {
718 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
720 } else if (S_ISLNK(a
->mode
)) {
721 hashcpy(result
.sha
, a
->sha1
);
723 if (!sha_eq(a
->sha1
, b
->sha1
))
726 die("unsupported object type in the tree");
733 static void conflict_rename_rename_1to2(struct merge_options
*o
,
739 /* One file was renamed in both branches, but to different names. */
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_2to1(struct merge_options
*o
,
792 /* Two files were renamed to the same thing. */
793 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
794 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
795 output(o
, 1, "Renaming %s to %s and %s to %s instead",
796 ren1
->pair
->one
->path
, new_path1
,
797 ren2
->pair
->one
->path
, new_path2
);
798 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
799 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
800 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
805 static int process_renames(struct merge_options
*o
,
806 struct string_list
*a_renames
,
807 struct string_list
*b_renames
)
809 int clean_merge
= 1, i
, j
;
810 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
811 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
812 const struct rename
*sre
;
814 for (i
= 0; i
< a_renames
->nr
; i
++) {
815 sre
= a_renames
->items
[i
].util
;
816 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
819 for (i
= 0; i
< b_renames
->nr
; i
++) {
820 sre
= b_renames
->items
[i
].util
;
821 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
825 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
827 struct string_list
*renames1
, *renames2Dst
;
828 struct rename
*ren1
= NULL
, *ren2
= NULL
;
829 const char *branch1
, *branch2
;
830 const char *ren1_src
, *ren1_dst
;
832 if (i
>= a_renames
->nr
) {
833 ren2
= b_renames
->items
[j
++].util
;
834 } else if (j
>= b_renames
->nr
) {
835 ren1
= a_renames
->items
[i
++].util
;
837 int compare
= strcmp(a_renames
->items
[i
].string
,
838 b_renames
->items
[j
].string
);
840 ren1
= a_renames
->items
[i
++].util
;
842 ren2
= b_renames
->items
[j
++].util
;
845 /* TODO: refactor, so that 1/2 are not needed */
847 renames1
= a_renames
;
848 renames2Dst
= &b_by_dst
;
849 branch1
= o
->branch1
;
850 branch2
= o
->branch2
;
853 renames1
= b_renames
;
854 renames2Dst
= &a_by_dst
;
855 branch1
= o
->branch2
;
856 branch2
= o
->branch1
;
861 src
= ren1
->pair
->one
->path
;
863 ren1
->dst_entry
->processed
= 1;
864 ren1
->src_entry
->processed
= 1;
870 ren1_src
= ren1
->pair
->one
->path
;
871 ren1_dst
= ren1
->pair
->two
->path
;
874 const char *ren2_src
= ren2
->pair
->one
->path
;
875 const char *ren2_dst
= ren2
->pair
->two
->path
;
876 /* Renamed in 1 and renamed in 2 */
877 if (strcmp(ren1_src
, ren2_src
) != 0)
878 die("ren1.src != ren2.src");
879 ren2
->dst_entry
->processed
= 1;
881 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
883 output(o
, 1, "CONFLICT (rename/rename): "
884 "Rename \"%s\"->\"%s\" in branch \"%s\" "
885 "rename \"%s\"->\"%s\" in \"%s\"%s",
886 src
, ren1_dst
, branch1
,
887 src
, ren2_dst
, branch2
,
888 o
->call_depth
? " (left unresolved)": "");
890 remove_file_from_cache(src
);
891 update_file(o
, 0, ren1
->pair
->one
->sha1
,
892 ren1
->pair
->one
->mode
, src
);
894 conflict_rename_rename_1to2(o
, ren1
, branch1
, ren2
, branch2
);
896 struct merge_file_info mfi
;
897 remove_file(o
, 1, ren1_src
, 1);
904 if (mfi
.merge
|| !mfi
.clean
)
905 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
908 output(o
, 2, "Auto-merging %s", ren1_dst
);
911 output(o
, 1, "CONFLICT (content): merge conflict in %s",
916 update_stages(ren1_dst
,
922 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
925 /* Renamed in 1, maybe changed in 2 */
926 struct string_list_item
*item
;
927 /* we only use sha1 and mode of these */
928 struct diff_filespec src_other
, dst_other
;
932 * unpack_trees loads entries from common-commit
933 * into stage 1, from head-commit into stage 2, and
934 * from merge-commit into stage 3. We keep track
935 * of which side corresponds to the rename.
937 int renamed_stage
= a_renames
== renames1
? 2 : 3;
938 int other_stage
= a_renames
== renames1
? 3 : 2;
940 remove_file(o
, 1, ren1_src
, o
->call_depth
|| renamed_stage
== 2);
942 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
943 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
944 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
945 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
948 if (sha_eq(src_other
.sha1
, null_sha1
)) {
950 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
952 ren1_src
, ren1_dst
, branch1
,
954 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
956 update_stages(ren1_dst
, NULL
,
957 branch1
== o
->branch1
?
958 ren1
->pair
->two
: NULL
,
959 branch1
== o
->branch1
?
960 NULL
: ren1
->pair
->two
, 1);
961 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
962 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
963 /* Added file on the other side
964 identical to the file being
965 renamed: clean merge */
966 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
967 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
968 const char *new_path
;
971 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
973 ren1_src
, ren1_dst
, branch1
,
976 struct merge_file_info mfi
;
977 struct diff_filespec one
, a
, b
;
979 one
.path
= a
.path
= b
.path
=
981 hashcpy(one
.sha1
, null_sha1
);
983 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
984 a
.mode
= ren1
->pair
->two
->mode
;
985 hashcpy(b
.sha1
, dst_other
.sha1
);
986 b
.mode
= dst_other
.mode
;
987 mfi
= merge_file(o
, &one
, &a
, &b
,
990 output(o
, 1, "Adding merged %s", ren1_dst
);
996 new_path
= unique_path(o
, ren1_dst
, branch2
);
997 output(o
, 1, "Adding as %s instead", new_path
);
998 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1000 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1003 ren2
->processed
= 1;
1004 output(o
, 1, "CONFLICT (rename/rename): "
1005 "Rename %s->%s in %s. "
1006 "Rename %s->%s in %s",
1007 ren1_src
, ren1_dst
, branch1
,
1008 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1009 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1014 struct diff_filespec
*one
, *a
, *b
;
1015 struct merge_file_info mfi
;
1016 src_other
.path
= (char *)ren1_src
;
1018 one
= ren1
->pair
->one
;
1019 if (a_renames
== renames1
) {
1020 a
= ren1
->pair
->two
;
1023 b
= ren1
->pair
->two
;
1026 mfi
= merge_file(o
, one
, a
, b
,
1027 o
->branch1
, o
->branch2
);
1030 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1031 mfi
.mode
== ren1
->pair
->two
->mode
) {
1033 * This message is part of
1034 * t6022 test. If you change
1035 * it update the test too.
1037 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1039 /* There may be higher stage entries left
1040 * in the index (e.g. due to a D/F
1041 * conflict) that need to be resolved.
1043 if (!ren1
->dst_entry
->stages
[2].mode
!=
1044 !ren1
->dst_entry
->stages
[3].mode
)
1045 ren1
->dst_entry
->processed
= 0;
1046 } else if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1048 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
1049 " directory %s added in %s",
1050 ren1_src
, ren1_dst
, branch1
,
1052 conflict_rename_dir(o
, ren1
, branch1
);
1054 if (mfi
.merge
|| !mfi
.clean
)
1055 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1057 output(o
, 2, "Auto-merging %s", ren1_dst
);
1059 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1064 update_stages(ren1_dst
,
1067 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1072 string_list_clear(&a_by_dst
, 0);
1073 string_list_clear(&b_by_dst
, 0);
1078 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1080 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1083 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1086 enum object_type type
;
1088 buf
= read_sha1_file(sha1
, &type
, &size
);
1090 return error("cannot read object %s", sha1_to_hex(sha1
));
1091 if (type
!= OBJ_BLOB
) {
1093 return error("object %s is not a blob", sha1_to_hex(sha1
));
1095 strbuf_attach(dst
, buf
, size
, size
+ 1);
1099 static int blob_unchanged(const unsigned char *o_sha
,
1100 const unsigned char *a_sha
,
1101 int renormalize
, const char *path
)
1103 struct strbuf o
= STRBUF_INIT
;
1104 struct strbuf a
= STRBUF_INIT
;
1105 int ret
= 0; /* assume changed for safety */
1107 if (sha_eq(o_sha
, a_sha
))
1112 assert(o_sha
&& a_sha
);
1113 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1116 * Note: binary | is used so that both renormalizations are
1117 * performed. Comparison can be skipped if both files are
1118 * unchanged since their sha1s have already been compared.
1120 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1121 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1122 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1130 /* Per entry merge function */
1131 static int process_entry(struct merge_options
*o
,
1132 const char *path
, struct stage_data
*entry
)
1135 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1136 print_index_entry("\tpath: ", entry);
1138 int clean_merge
= 1;
1139 int normalize
= o
->renormalize
;
1140 unsigned o_mode
= entry
->stages
[1].mode
;
1141 unsigned a_mode
= entry
->stages
[2].mode
;
1142 unsigned b_mode
= entry
->stages
[3].mode
;
1143 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1144 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1145 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1147 entry
->processed
= 1;
1148 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1149 /* Case A: Deleted in one */
1150 if ((!a_sha
&& !b_sha
) ||
1151 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1152 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1153 /* Deleted in both or deleted in one and
1154 * unchanged in the other */
1156 output(o
, 2, "Removing %s", path
);
1157 /* do not touch working file if it did not exist */
1158 remove_file(o
, 1, path
, !a_sha
);
1160 /* Deleted in one and changed in the other */
1163 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1164 "and modified in %s. Version %s of %s left in tree.",
1166 o
->branch2
, o
->branch2
, path
);
1167 update_file(o
, 0, b_sha
, b_mode
, path
);
1169 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1170 "and modified in %s. Version %s of %s left in tree.",
1172 o
->branch1
, o
->branch1
, path
);
1173 update_file(o
, 0, a_sha
, a_mode
, path
);
1177 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1178 (!o_sha
&& !a_sha
&& b_sha
)) {
1179 /* Case B: Added in one. */
1181 const unsigned char *sha
;
1190 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1191 /* Handle D->F conflicts after all subfiles */
1192 entry
->processed
= 0;
1193 /* But get any file out of the way now, so conflicted
1194 * entries below the directory of the same name can
1195 * be put in the working directory.
1198 output(o
, 2, "Removing %s", path
);
1199 /* do not touch working file if it did not exist */
1200 remove_file(o
, 0, path
, !a_sha
);
1201 return 1; /* Assume clean till processed */
1203 output(o
, 2, "Adding %s", path
);
1204 update_file(o
, 1, sha
, mode
, path
);
1206 } else if (a_sha
&& b_sha
) {
1207 /* Case C: Added in both (check for same permissions) and */
1208 /* case D: Modified in both, but differently. */
1209 const char *reason
= "content";
1210 struct merge_file_info mfi
;
1211 struct diff_filespec one
, a
, b
;
1215 o_sha
= (unsigned char *)null_sha1
;
1217 output(o
, 2, "Auto-merging %s", path
);
1218 one
.path
= a
.path
= b
.path
= (char *)path
;
1219 hashcpy(one
.sha1
, o_sha
);
1221 hashcpy(a
.sha1
, a_sha
);
1223 hashcpy(b
.sha1
, b_sha
);
1226 mfi
= merge_file(o
, &one
, &a
, &b
,
1227 o
->branch1
, o
->branch2
);
1229 clean_merge
= mfi
.clean
;
1231 if (S_ISGITLINK(mfi
.mode
))
1232 reason
= "submodule";
1233 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1236 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1237 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1239 * this entry was deleted altogether. a_mode == 0 means
1240 * we had that path and want to actively remove it.
1242 remove_file(o
, 1, path
, !a_mode
);
1244 die("Fatal merge failure, shouldn't happen.");
1250 * Per entry merge function for D/F conflicts, to be called only after
1251 * all files below dir have been processed. We do this because in the
1252 * cases we can cleanly resolve D/F conflicts, process_entry() can clean
1253 * out all the files below the directory for us.
1255 static int process_df_entry(struct merge_options
*o
,
1256 const char *path
, struct stage_data
*entry
)
1258 int clean_merge
= 1;
1259 unsigned o_mode
= entry
->stages
[1].mode
;
1260 unsigned a_mode
= entry
->stages
[2].mode
;
1261 unsigned b_mode
= entry
->stages
[3].mode
;
1262 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1263 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1264 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1265 const char *add_branch
;
1266 const char *other_branch
;
1268 const unsigned char *sha
;
1272 if (!((!o_sha
&& a_sha
&& !b_sha
) || (!o_sha
&& !a_sha
&& b_sha
)))
1273 return 1; /* we don't handle non D-F cases */
1275 entry
->processed
= 1;
1278 add_branch
= o
->branch1
;
1279 other_branch
= o
->branch2
;
1282 conf
= "file/directory";
1284 add_branch
= o
->branch2
;
1285 other_branch
= o
->branch1
;
1288 conf
= "directory/file";
1290 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1291 const char *new_path
= unique_path(o
, path
, add_branch
);
1293 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1295 conf
, path
, other_branch
, path
, new_path
);
1296 remove_file(o
, 0, path
, 0);
1297 update_file(o
, 0, sha
, mode
, new_path
);
1299 output(o
, 2, "Adding %s", path
);
1300 update_file(o
, 1, sha
, mode
, path
);
1306 int merge_trees(struct merge_options
*o
,
1309 struct tree
*common
,
1310 struct tree
**result
)
1314 if (o
->subtree_shift
) {
1315 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1316 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1319 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1320 output(o
, 0, "Already up-to-date!");
1325 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1328 if (show(o
, 4) || o
->call_depth
)
1329 die("merging of trees %s and %s failed",
1330 sha1_to_hex(head
->object
.sha1
),
1331 sha1_to_hex(merge
->object
.sha1
));
1336 if (unmerged_cache()) {
1337 struct string_list
*entries
, *re_head
, *re_merge
;
1339 string_list_clear(&o
->current_file_set
, 1);
1340 string_list_clear(&o
->current_directory_set
, 1);
1341 get_files_dirs(o
, head
);
1342 get_files_dirs(o
, merge
);
1344 entries
= get_unmerged();
1345 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1346 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1347 clean
= process_renames(o
, re_head
, re_merge
);
1348 for (i
= 0; i
< entries
->nr
; i
++) {
1349 const char *path
= entries
->items
[i
].string
;
1350 struct stage_data
*e
= entries
->items
[i
].util
;
1352 && !process_entry(o
, path
, e
))
1355 for (i
= 0; i
< entries
->nr
; i
++) {
1356 const char *path
= entries
->items
[i
].string
;
1357 struct stage_data
*e
= entries
->items
[i
].util
;
1359 && !process_df_entry(o
, path
, e
))
1362 for (i
= 0; i
< entries
->nr
; i
++) {
1363 struct stage_data
*e
= entries
->items
[i
].util
;
1365 die("Unprocessed path??? %s",
1366 entries
->items
[i
].string
);
1369 string_list_clear(re_merge
, 0);
1370 string_list_clear(re_head
, 0);
1371 string_list_clear(entries
, 1);
1378 *result
= write_tree_from_memory(o
);
1383 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1385 struct commit_list
*next
= NULL
, *current
, *backup
;
1386 for (current
= list
; current
; current
= backup
) {
1387 backup
= current
->next
;
1388 current
->next
= next
;
1395 * Merge the commits h1 and h2, return the resulting virtual
1396 * commit object and a flag indicating the cleanness of the merge.
1398 int merge_recursive(struct merge_options
*o
,
1401 struct commit_list
*ca
,
1402 struct commit
**result
)
1404 struct commit_list
*iter
;
1405 struct commit
*merged_common_ancestors
;
1406 struct tree
*mrtree
= mrtree
;
1410 output(o
, 4, "Merging:");
1411 output_commit_title(o
, h1
);
1412 output_commit_title(o
, h2
);
1416 ca
= get_merge_bases(h1
, h2
, 1);
1417 ca
= reverse_commit_list(ca
);
1421 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1422 for (iter
= ca
; iter
; iter
= iter
->next
)
1423 output_commit_title(o
, iter
->item
);
1426 merged_common_ancestors
= pop_commit(&ca
);
1427 if (merged_common_ancestors
== NULL
) {
1428 /* if there is no common ancestor, make an empty tree */
1429 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1431 tree
->object
.parsed
= 1;
1432 tree
->object
.type
= OBJ_TREE
;
1433 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1434 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1437 for (iter
= ca
; iter
; iter
= iter
->next
) {
1438 const char *saved_b1
, *saved_b2
;
1441 * When the merge fails, the result contains files
1442 * with conflict markers. The cleanness flag is
1443 * ignored, it was never actually used, as result of
1444 * merge_trees has always overwritten it: the committed
1445 * "conflicts" were already resolved.
1448 saved_b1
= o
->branch1
;
1449 saved_b2
= o
->branch2
;
1450 o
->branch1
= "Temporary merge branch 1";
1451 o
->branch2
= "Temporary merge branch 2";
1452 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1453 NULL
, &merged_common_ancestors
);
1454 o
->branch1
= saved_b1
;
1455 o
->branch2
= saved_b2
;
1458 if (!merged_common_ancestors
)
1459 die("merge returned no commit");
1466 o
->ancestor
= "merged common ancestors";
1467 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1470 if (o
->call_depth
) {
1471 *result
= make_virtual_commit(mrtree
, "merged tree");
1472 commit_list_insert(h1
, &(*result
)->parents
);
1473 commit_list_insert(h2
, &(*result
)->parents
->next
);
1479 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1481 struct object
*object
;
1483 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1486 if (object
->type
== OBJ_TREE
)
1487 return make_virtual_commit((struct tree
*)object
, name
);
1488 if (object
->type
!= OBJ_COMMIT
)
1490 if (parse_commit((struct commit
*)object
))
1492 return (struct commit
*)object
;
1495 int merge_recursive_generic(struct merge_options
*o
,
1496 const unsigned char *head
,
1497 const unsigned char *merge
,
1499 const unsigned char **base_list
,
1500 struct commit
**result
)
1502 int clean
, index_fd
;
1503 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1504 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1505 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1506 struct commit_list
*ca
= NULL
;
1510 for (i
= 0; i
< num_base_list
; ++i
) {
1511 struct commit
*base
;
1512 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1513 return error("Could not parse object '%s'",
1514 sha1_to_hex(base_list
[i
]));
1515 commit_list_insert(base
, &ca
);
1519 index_fd
= hold_locked_index(lock
, 1);
1520 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1522 if (active_cache_changed
&&
1523 (write_cache(index_fd
, active_cache
, active_nr
) ||
1524 commit_locked_index(lock
)))
1525 return error("Unable to write index.");
1527 return clean
? 0 : 1;
1530 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1532 struct merge_options
*o
= cb
;
1533 if (!strcasecmp(var
, "merge.verbosity")) {
1534 o
->verbosity
= git_config_int(var
, value
);
1537 if (!strcasecmp(var
, "diff.renamelimit")) {
1538 o
->diff_rename_limit
= git_config_int(var
, value
);
1541 if (!strcasecmp(var
, "merge.renamelimit")) {
1542 o
->merge_rename_limit
= git_config_int(var
, value
);
1545 return git_xmerge_config(var
, value
, cb
);
1548 void init_merge_options(struct merge_options
*o
)
1550 memset(o
, 0, sizeof(struct merge_options
));
1552 o
->buffer_output
= 1;
1553 o
->diff_rename_limit
= -1;
1554 o
->merge_rename_limit
= -1;
1556 git_config(merge_recursive_config
, o
);
1557 if (getenv("GIT_MERGE_VERBOSITY"))
1559 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1560 if (o
->verbosity
>= 5)
1561 o
->buffer_output
= 0;
1562 strbuf_init(&o
->obuf
, 0);
1563 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1564 o
->current_file_set
.strdup_strings
= 1;
1565 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1566 o
->current_directory_set
.strdup_strings
= 1;