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 set_porcelain_error_msgs(opts
.msgs
, "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
) | (favor
<< 1));
657 static struct merge_file_info
merge_file(struct merge_options
*o
,
658 struct diff_filespec
*one
,
659 struct diff_filespec
*a
,
660 struct diff_filespec
*b
,
664 struct merge_file_info result
;
668 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
670 if (S_ISREG(a
->mode
)) {
671 result
.mode
= a
->mode
;
672 hashcpy(result
.sha
, a
->sha1
);
674 result
.mode
= b
->mode
;
675 hashcpy(result
.sha
, b
->sha1
);
678 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
684 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
685 result
.mode
= b
->mode
;
687 result
.mode
= a
->mode
;
688 if (b
->mode
!= one
->mode
) {
694 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
695 hashcpy(result
.sha
, b
->sha1
);
696 else if (sha_eq(b
->sha1
, one
->sha1
))
697 hashcpy(result
.sha
, a
->sha1
);
698 else if (S_ISREG(a
->mode
)) {
699 mmbuffer_t result_buf
;
702 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
705 if ((merge_status
< 0) || !result_buf
.ptr
)
706 die("Failed to execute internal merge");
708 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
709 blob_type
, result
.sha
))
710 die("Unable to add %s to database",
713 free(result_buf
.ptr
);
714 result
.clean
= (merge_status
== 0);
715 } else if (S_ISGITLINK(a
->mode
)) {
716 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
718 } else if (S_ISLNK(a
->mode
)) {
719 hashcpy(result
.sha
, a
->sha1
);
721 if (!sha_eq(a
->sha1
, b
->sha1
))
724 die("unsupported object type in the tree");
731 static void conflict_rename_rename(struct merge_options
*o
,
739 const char *ren1_dst
= ren1
->pair
->two
->path
;
740 const char *ren2_dst
= ren2
->pair
->two
->path
;
741 const char *dst_name1
= ren1_dst
;
742 const char *dst_name2
= ren2_dst
;
743 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
744 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
745 output(o
, 1, "%s is a directory in %s adding as %s instead",
746 ren1_dst
, branch2
, dst_name1
);
747 remove_file(o
, 0, ren1_dst
, 0);
749 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
750 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
751 output(o
, 1, "%s is a directory in %s adding as %s instead",
752 ren2_dst
, branch1
, dst_name2
);
753 remove_file(o
, 0, ren2_dst
, 0);
756 remove_file_from_cache(dst_name1
);
757 remove_file_from_cache(dst_name2
);
759 * Uncomment to leave the conflicting names in the resulting tree
761 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
762 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
765 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
766 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
772 static void conflict_rename_dir(struct merge_options
*o
,
776 char *new_path
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
777 output(o
, 1, "Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
778 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
779 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
783 static void conflict_rename_rename_2(struct merge_options
*o
,
789 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
790 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
791 output(o
, 1, "Renaming %s to %s and %s to %s instead",
792 ren1
->pair
->one
->path
, new_path1
,
793 ren2
->pair
->one
->path
, new_path2
);
794 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
795 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
796 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
801 static int process_renames(struct merge_options
*o
,
802 struct string_list
*a_renames
,
803 struct string_list
*b_renames
)
805 int clean_merge
= 1, i
, j
;
806 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
807 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
808 const struct rename
*sre
;
810 for (i
= 0; i
< a_renames
->nr
; i
++) {
811 sre
= a_renames
->items
[i
].util
;
812 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
815 for (i
= 0; i
< b_renames
->nr
; i
++) {
816 sre
= b_renames
->items
[i
].util
;
817 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
821 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
823 struct string_list
*renames1
, *renames2Dst
;
824 struct rename
*ren1
= NULL
, *ren2
= NULL
;
825 const char *branch1
, *branch2
;
826 const char *ren1_src
, *ren1_dst
;
828 if (i
>= a_renames
->nr
) {
829 ren2
= b_renames
->items
[j
++].util
;
830 } else if (j
>= b_renames
->nr
) {
831 ren1
= a_renames
->items
[i
++].util
;
833 int compare
= strcmp(a_renames
->items
[i
].string
,
834 b_renames
->items
[j
].string
);
836 ren1
= a_renames
->items
[i
++].util
;
838 ren2
= b_renames
->items
[j
++].util
;
841 /* TODO: refactor, so that 1/2 are not needed */
843 renames1
= a_renames
;
844 renames2Dst
= &b_by_dst
;
845 branch1
= o
->branch1
;
846 branch2
= o
->branch2
;
849 renames1
= b_renames
;
850 renames2Dst
= &a_by_dst
;
851 branch1
= o
->branch2
;
852 branch2
= o
->branch1
;
857 src
= ren1
->pair
->one
->path
;
859 ren1
->dst_entry
->processed
= 1;
860 ren1
->src_entry
->processed
= 1;
866 ren1_src
= ren1
->pair
->one
->path
;
867 ren1_dst
= ren1
->pair
->two
->path
;
870 const char *ren2_src
= ren2
->pair
->one
->path
;
871 const char *ren2_dst
= ren2
->pair
->two
->path
;
872 /* Renamed in 1 and renamed in 2 */
873 if (strcmp(ren1_src
, ren2_src
) != 0)
874 die("ren1.src != ren2.src");
875 ren2
->dst_entry
->processed
= 1;
877 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
879 output(o
, 1, "CONFLICT (rename/rename): "
880 "Rename \"%s\"->\"%s\" in branch \"%s\" "
881 "rename \"%s\"->\"%s\" in \"%s\"%s",
882 src
, ren1_dst
, branch1
,
883 src
, ren2_dst
, branch2
,
884 o
->call_depth
? " (left unresolved)": "");
886 remove_file_from_cache(src
);
887 update_file(o
, 0, ren1
->pair
->one
->sha1
,
888 ren1
->pair
->one
->mode
, src
);
890 conflict_rename_rename(o
, ren1
, branch1
, ren2
, branch2
);
892 struct merge_file_info mfi
;
893 remove_file(o
, 1, ren1_src
, 1);
900 if (mfi
.merge
|| !mfi
.clean
)
901 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
904 output(o
, 2, "Auto-merging %s", ren1_dst
);
907 output(o
, 1, "CONFLICT (content): merge conflict in %s",
912 update_stages(ren1_dst
,
918 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
921 /* Renamed in 1, maybe changed in 2 */
922 struct string_list_item
*item
;
923 /* we only use sha1 and mode of these */
924 struct diff_filespec src_other
, dst_other
;
925 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
927 remove_file(o
, 1, ren1_src
, o
->call_depth
|| stage
== 3);
929 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
930 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
931 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
932 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
936 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
938 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
939 " directory %s added in %s",
940 ren1_src
, ren1_dst
, branch1
,
942 conflict_rename_dir(o
, ren1
, branch1
);
943 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
945 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
947 ren1_src
, ren1_dst
, branch1
,
949 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
951 update_stages(ren1_dst
, NULL
,
952 branch1
== o
->branch1
?
953 ren1
->pair
->two
: NULL
,
954 branch1
== o
->branch1
?
955 NULL
: ren1
->pair
->two
, 1);
956 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
957 const char *new_path
;
960 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
962 ren1_src
, ren1_dst
, branch1
,
965 struct merge_file_info mfi
;
966 struct diff_filespec one
, a
, b
;
968 one
.path
= a
.path
= b
.path
=
970 hashcpy(one
.sha1
, null_sha1
);
972 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
973 a
.mode
= ren1
->pair
->two
->mode
;
974 hashcpy(b
.sha1
, dst_other
.sha1
);
975 b
.mode
= dst_other
.mode
;
976 mfi
= merge_file(o
, &one
, &a
, &b
,
979 output(o
, 1, "Adding merged %s", ren1_dst
);
985 new_path
= unique_path(o
, ren1_dst
, branch2
);
986 output(o
, 1, "Adding as %s instead", new_path
);
987 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
989 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
993 output(o
, 1, "CONFLICT (rename/rename): "
994 "Rename %s->%s in %s. "
995 "Rename %s->%s in %s",
996 ren1_src
, ren1_dst
, branch1
,
997 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
998 conflict_rename_rename_2(o
, ren1
, branch1
, ren2
, branch2
);
1003 struct diff_filespec
*one
, *a
, *b
;
1004 struct merge_file_info mfi
;
1005 src_other
.path
= (char *)ren1_src
;
1007 one
= ren1
->pair
->one
;
1008 if (a_renames
== renames1
) {
1009 a
= ren1
->pair
->two
;
1012 b
= ren1
->pair
->two
;
1015 mfi
= merge_file(o
, one
, a
, b
,
1016 o
->branch1
, o
->branch2
);
1019 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1020 mfi
.mode
== ren1
->pair
->two
->mode
) {
1022 * This messaged is part of
1023 * t6022 test. If you change
1024 * it update the test too.
1026 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1028 /* There may be higher stage entries left
1029 * in the index (e.g. due to a D/F
1030 * conflict) that need to be resolved.
1032 for (i
= 1; i
<= 3; i
++) {
1033 if (!ren1
->dst_entry
->stages
[i
].mode
)
1035 ren1
->dst_entry
->processed
= 0;
1039 if (mfi
.merge
|| !mfi
.clean
)
1040 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1042 output(o
, 2, "Auto-merging %s", ren1_dst
);
1044 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1049 update_stages(ren1_dst
,
1052 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1057 string_list_clear(&a_by_dst
, 0);
1058 string_list_clear(&b_by_dst
, 0);
1063 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1065 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1068 /* Per entry merge function */
1069 static int process_entry(struct merge_options
*o
,
1070 const char *path
, struct stage_data
*entry
)
1073 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1074 print_index_entry("\tpath: ", entry);
1076 int clean_merge
= 1;
1077 unsigned o_mode
= entry
->stages
[1].mode
;
1078 unsigned a_mode
= entry
->stages
[2].mode
;
1079 unsigned b_mode
= entry
->stages
[3].mode
;
1080 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1081 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1082 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1084 entry
->processed
= 1;
1085 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1086 /* Case A: Deleted in one */
1087 if ((!a_sha
&& !b_sha
) ||
1088 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1089 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1090 /* Deleted in both or deleted in one and
1091 * unchanged in the other */
1093 output(o
, 2, "Removing %s", path
);
1094 /* do not touch working file if it did not exist */
1095 remove_file(o
, 1, path
, !a_sha
);
1097 /* Deleted in one and changed in the other */
1100 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1101 "and modified in %s. Version %s of %s left in tree.",
1103 o
->branch2
, o
->branch2
, path
);
1104 update_file(o
, 0, b_sha
, b_mode
, path
);
1106 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1107 "and modified in %s. Version %s of %s left in tree.",
1109 o
->branch1
, o
->branch1
, path
);
1110 update_file(o
, 0, a_sha
, a_mode
, path
);
1114 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1115 (!o_sha
&& !a_sha
&& b_sha
)) {
1116 /* Case B: Added in one. */
1118 const unsigned char *sha
;
1127 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1128 /* Handle D->F conflicts after all subfiles */
1129 entry
->processed
= 0;
1130 /* But get any file out of the way now, so conflicted
1131 * entries below the directory of the same name can
1132 * be put in the working directory.
1135 output(o
, 2, "Removing %s", path
);
1136 /* do not touch working file if it did not exist */
1137 remove_file(o
, 0, path
, !a_sha
);
1138 return 1; /* Assume clean till processed */
1140 output(o
, 2, "Adding %s", path
);
1141 update_file(o
, 1, sha
, mode
, path
);
1143 } else if (a_sha
&& b_sha
) {
1144 /* Case C: Added in both (check for same permissions) and */
1145 /* case D: Modified in both, but differently. */
1146 const char *reason
= "content";
1147 struct merge_file_info mfi
;
1148 struct diff_filespec one
, a
, b
;
1152 o_sha
= (unsigned char *)null_sha1
;
1154 output(o
, 2, "Auto-merging %s", path
);
1155 one
.path
= a
.path
= b
.path
= (char *)path
;
1156 hashcpy(one
.sha1
, o_sha
);
1158 hashcpy(a
.sha1
, a_sha
);
1160 hashcpy(b
.sha1
, b_sha
);
1163 mfi
= merge_file(o
, &one
, &a
, &b
,
1164 o
->branch1
, o
->branch2
);
1166 clean_merge
= mfi
.clean
;
1168 if (S_ISGITLINK(mfi
.mode
))
1169 reason
= "submodule";
1170 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1173 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1174 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1176 * this entry was deleted altogether. a_mode == 0 means
1177 * we had that path and want to actively remove it.
1179 remove_file(o
, 1, path
, !a_mode
);
1181 die("Fatal merge failure, shouldn't happen.");
1187 * Per entry merge function for D/F conflicts, to be called only after
1188 * all files below dir have been processed. We do this because in the
1189 * cases we can cleanly resolve D/F conflicts, process_entry() can clean
1190 * out all the files below the directory for us.
1192 static int process_df_entry(struct merge_options
*o
,
1193 const char *path
, struct stage_data
*entry
)
1195 int clean_merge
= 1;
1196 unsigned o_mode
= entry
->stages
[1].mode
;
1197 unsigned a_mode
= entry
->stages
[2].mode
;
1198 unsigned b_mode
= entry
->stages
[3].mode
;
1199 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1200 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1201 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1202 const char *add_branch
;
1203 const char *other_branch
;
1205 const unsigned char *sha
;
1209 /* We currently only handle D->F cases */
1210 assert((!o_sha
&& a_sha
&& !b_sha
) ||
1211 (!o_sha
&& !a_sha
&& b_sha
));
1213 entry
->processed
= 1;
1216 add_branch
= o
->branch1
;
1217 other_branch
= o
->branch2
;
1220 conf
= "file/directory";
1222 add_branch
= o
->branch2
;
1223 other_branch
= o
->branch1
;
1226 conf
= "directory/file";
1228 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1229 const char *new_path
= unique_path(o
, path
, add_branch
);
1231 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1233 conf
, path
, other_branch
, path
, new_path
);
1234 remove_file(o
, 0, path
, 0);
1235 update_file(o
, 0, sha
, mode
, new_path
);
1237 output(o
, 2, "Adding %s", path
);
1238 update_file(o
, 1, sha
, mode
, path
);
1244 void set_porcelain_error_msgs(const char **msgs
, const char *cmd
)
1248 const char *cmd2
= strcmp(cmd
, "checkout") ? cmd
: "switch branches";
1249 if (advice_commit_before_merge
)
1250 msg
= "Your local changes to the following files would be overwritten by %s:\n%%s"
1251 "Please, commit your changes or stash them before you can %s.";
1253 msg
= "Your local changes to the following files would be overwritten by %s:\n%%s";
1254 tmp
= xmalloc(strlen(msg
) + strlen(cmd
) + strlen(cmd2
) - 2);
1255 sprintf(tmp
, msg
, cmd
, cmd2
);
1256 msgs
[ERROR_WOULD_OVERWRITE
] = tmp
;
1257 msgs
[ERROR_NOT_UPTODATE_FILE
] = tmp
;
1259 msgs
[ERROR_NOT_UPTODATE_DIR
] =
1260 "Updating the following directories would lose untracked files in it:\n%s";
1262 if (advice_commit_before_merge
)
1263 msg
= "The following untracked working tree files would be %s by %s:\n%%s"
1264 "Please move or remove them before you can %s.";
1266 msg
= "The following untracked working tree files would be %s by %s:\n%%s";
1267 tmp
= xmalloc(strlen(msg
) + strlen(cmd
) + strlen("removed") + strlen(cmd2
) - 4);
1268 sprintf(tmp
, msg
, "removed", cmd
, cmd2
);
1269 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] = tmp
;
1270 tmp
= xmalloc(strlen(msg
) + strlen(cmd
) + strlen("overwritten") + strlen(cmd2
) - 4);
1271 sprintf(tmp
, msg
, "overwritten", cmd
, cmd2
);
1272 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] = tmp
;
1275 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
1276 * cannot easily display it as a list.
1278 msgs
[ERROR_BIND_OVERLAP
] = "Entry '%s' overlaps with '%s'. Cannot bind.";
1280 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
1281 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
1282 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
1283 "The following Working tree files would be overwritten by sparse checkout update:\n%s";
1284 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
1285 "The following Working tree files would be removed by sparse checkout update:\n%s";
1288 int merge_trees(struct merge_options
*o
,
1291 struct tree
*common
,
1292 struct tree
**result
)
1296 if (o
->subtree_shift
) {
1297 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1298 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1301 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1302 output(o
, 0, "Already up-to-date!");
1307 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1310 if (show(o
, 4) || o
->call_depth
)
1311 die("merging of trees %s and %s failed",
1312 sha1_to_hex(head
->object
.sha1
),
1313 sha1_to_hex(merge
->object
.sha1
));
1318 if (unmerged_cache()) {
1319 struct string_list
*entries
, *re_head
, *re_merge
;
1321 string_list_clear(&o
->current_file_set
, 1);
1322 string_list_clear(&o
->current_directory_set
, 1);
1323 get_files_dirs(o
, head
);
1324 get_files_dirs(o
, merge
);
1326 entries
= get_unmerged();
1327 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1328 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1329 clean
= process_renames(o
, re_head
, re_merge
);
1330 for (i
= 0; i
< entries
->nr
; i
++) {
1331 const char *path
= entries
->items
[i
].string
;
1332 struct stage_data
*e
= entries
->items
[i
].util
;
1334 && !process_entry(o
, path
, e
))
1337 for (i
= 0; i
< entries
->nr
; i
++) {
1338 const char *path
= entries
->items
[i
].string
;
1339 struct stage_data
*e
= entries
->items
[i
].util
;
1341 && !process_df_entry(o
, path
, e
))
1345 string_list_clear(re_merge
, 0);
1346 string_list_clear(re_head
, 0);
1347 string_list_clear(entries
, 1);
1354 *result
= write_tree_from_memory(o
);
1359 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1361 struct commit_list
*next
= NULL
, *current
, *backup
;
1362 for (current
= list
; current
; current
= backup
) {
1363 backup
= current
->next
;
1364 current
->next
= next
;
1371 * Merge the commits h1 and h2, return the resulting virtual
1372 * commit object and a flag indicating the cleanness of the merge.
1374 int merge_recursive(struct merge_options
*o
,
1377 struct commit_list
*ca
,
1378 struct commit
**result
)
1380 struct commit_list
*iter
;
1381 struct commit
*merged_common_ancestors
;
1382 struct tree
*mrtree
= mrtree
;
1386 output(o
, 4, "Merging:");
1387 output_commit_title(o
, h1
);
1388 output_commit_title(o
, h2
);
1392 ca
= get_merge_bases(h1
, h2
, 1);
1393 ca
= reverse_commit_list(ca
);
1397 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1398 for (iter
= ca
; iter
; iter
= iter
->next
)
1399 output_commit_title(o
, iter
->item
);
1402 merged_common_ancestors
= pop_commit(&ca
);
1403 if (merged_common_ancestors
== NULL
) {
1404 /* if there is no common ancestor, make an empty tree */
1405 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1407 tree
->object
.parsed
= 1;
1408 tree
->object
.type
= OBJ_TREE
;
1409 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1410 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1413 for (iter
= ca
; iter
; iter
= iter
->next
) {
1414 const char *saved_b1
, *saved_b2
;
1417 * When the merge fails, the result contains files
1418 * with conflict markers. The cleanness flag is
1419 * ignored, it was never actually used, as result of
1420 * merge_trees has always overwritten it: the committed
1421 * "conflicts" were already resolved.
1424 saved_b1
= o
->branch1
;
1425 saved_b2
= o
->branch2
;
1426 o
->branch1
= "Temporary merge branch 1";
1427 o
->branch2
= "Temporary merge branch 2";
1428 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1429 NULL
, &merged_common_ancestors
);
1430 o
->branch1
= saved_b1
;
1431 o
->branch2
= saved_b2
;
1434 if (!merged_common_ancestors
)
1435 die("merge returned no commit");
1442 o
->ancestor
= "merged common ancestors";
1443 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1446 if (o
->call_depth
) {
1447 *result
= make_virtual_commit(mrtree
, "merged tree");
1448 commit_list_insert(h1
, &(*result
)->parents
);
1449 commit_list_insert(h2
, &(*result
)->parents
->next
);
1455 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1457 struct object
*object
;
1459 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1462 if (object
->type
== OBJ_TREE
)
1463 return make_virtual_commit((struct tree
*)object
, name
);
1464 if (object
->type
!= OBJ_COMMIT
)
1466 if (parse_commit((struct commit
*)object
))
1468 return (struct commit
*)object
;
1471 int merge_recursive_generic(struct merge_options
*o
,
1472 const unsigned char *head
,
1473 const unsigned char *merge
,
1475 const unsigned char **base_list
,
1476 struct commit
**result
)
1478 int clean
, index_fd
;
1479 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1480 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1481 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1482 struct commit_list
*ca
= NULL
;
1486 for (i
= 0; i
< num_base_list
; ++i
) {
1487 struct commit
*base
;
1488 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1489 return error("Could not parse object '%s'",
1490 sha1_to_hex(base_list
[i
]));
1491 commit_list_insert(base
, &ca
);
1495 index_fd
= hold_locked_index(lock
, 1);
1496 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1498 if (active_cache_changed
&&
1499 (write_cache(index_fd
, active_cache
, active_nr
) ||
1500 commit_locked_index(lock
)))
1501 return error("Unable to write index.");
1503 return clean
? 0 : 1;
1506 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1508 struct merge_options
*o
= cb
;
1509 if (!strcasecmp(var
, "merge.verbosity")) {
1510 o
->verbosity
= git_config_int(var
, value
);
1513 if (!strcasecmp(var
, "diff.renamelimit")) {
1514 o
->diff_rename_limit
= git_config_int(var
, value
);
1517 if (!strcasecmp(var
, "merge.renamelimit")) {
1518 o
->merge_rename_limit
= git_config_int(var
, value
);
1521 return git_xmerge_config(var
, value
, cb
);
1524 void init_merge_options(struct merge_options
*o
)
1526 memset(o
, 0, sizeof(struct merge_options
));
1528 o
->buffer_output
= 1;
1529 o
->diff_rename_limit
= -1;
1530 o
->merge_rename_limit
= -1;
1531 git_config(merge_recursive_config
, o
);
1532 if (getenv("GIT_MERGE_VERBOSITY"))
1534 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1535 if (o
->verbosity
>= 5)
1536 o
->buffer_output
= 0;
1537 strbuf_init(&o
->obuf
, 0);
1538 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1539 o
->current_file_set
.strdup_strings
= 1;
1540 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1541 o
->current_directory_set
.strdup_strings
= 1;