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 opts
.msgs
= get_porcelain_error_msgs();
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(newpath
, &o
->current_directory_set
);
243 string_list_insert(newpath
, &o
->current_file_set
);
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(path
, entries
);
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(ce
->name
, unmerged
);
299 item
= string_list_insert(ce
->name
, unmerged
);
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(re
->pair
->one
->path
, entries
);
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(re
->pair
->two
->path
, entries
);
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(pair
->one
->path
, renames
);
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
) && errno
!= ENOENT
)
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(newpath
, &o
->current_file_set
);
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 (!S_ISGITLINK(mode
) && 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_ISGITLINK(mode
) || S_ISREG(mode
) ||
556 (!has_symlinks
&& S_ISLNK(mode
))) {
562 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
564 die_errno("failed to open '%s'", path
);
565 flush_buffer(fd
, buf
, size
);
567 } else if (S_ISLNK(mode
)) {
568 char *lnk
= xmemdupz(buf
, size
);
569 safe_create_leading_directories_const(path
);
571 if (symlink(lnk
, path
))
572 die_errno("failed to symlink '%s'", path
);
575 die("do not know what to do with %06o %s '%s'",
576 mode
, sha1_to_hex(sha
), path
);
581 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
584 static void update_file(struct merge_options
*o
,
586 const unsigned char *sha
,
590 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
593 /* Low level file merging, update and removal */
595 struct merge_file_info
597 unsigned char sha
[20];
603 static void fill_mm(const unsigned char *sha1
, mmfile_t
*mm
)
606 enum object_type type
;
608 if (!hashcmp(sha1
, null_sha1
)) {
609 mm
->ptr
= xstrdup("");
614 mm
->ptr
= read_sha1_file(sha1
, &type
, &size
);
615 if (!mm
->ptr
|| type
!= OBJ_BLOB
)
616 die("unable to read blob object %s", sha1_to_hex(sha1
));
620 static int merge_3way(struct merge_options
*o
,
621 mmbuffer_t
*result_buf
,
622 struct diff_filespec
*one
,
623 struct diff_filespec
*a
,
624 struct diff_filespec
*b
,
628 mmfile_t orig
, src1
, src2
;
636 switch (o
->recursive_variant
) {
637 case MERGE_RECURSIVE_OURS
:
638 favor
= XDL_MERGE_FAVOR_OURS
;
640 case MERGE_RECURSIVE_THEIRS
:
641 favor
= XDL_MERGE_FAVOR_THEIRS
;
649 if (strcmp(a
->path
, b
->path
)) {
650 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
651 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
653 name1
= xstrdup(mkpath("%s", branch1
));
654 name2
= xstrdup(mkpath("%s", branch2
));
657 fill_mm(one
->sha1
, &orig
);
658 fill_mm(a
->sha1
, &src1
);
659 fill_mm(b
->sha1
, &src2
);
661 merge_status
= ll_merge(result_buf
, a
->path
, &orig
,
662 &src1
, name1
, &src2
, name2
,
663 (!!o
->call_depth
) | (favor
<< 1));
673 static struct merge_file_info
merge_file(struct merge_options
*o
,
674 struct diff_filespec
*one
,
675 struct diff_filespec
*a
,
676 struct diff_filespec
*b
,
680 struct merge_file_info result
;
684 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
686 if (S_ISREG(a
->mode
)) {
687 result
.mode
= a
->mode
;
688 hashcpy(result
.sha
, a
->sha1
);
690 result
.mode
= b
->mode
;
691 hashcpy(result
.sha
, b
->sha1
);
694 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
700 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
701 result
.mode
= b
->mode
;
703 result
.mode
= a
->mode
;
704 if (b
->mode
!= one
->mode
) {
710 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
711 hashcpy(result
.sha
, b
->sha1
);
712 else if (sha_eq(b
->sha1
, one
->sha1
))
713 hashcpy(result
.sha
, a
->sha1
);
714 else if (S_ISREG(a
->mode
)) {
715 mmbuffer_t result_buf
;
718 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
721 if ((merge_status
< 0) || !result_buf
.ptr
)
722 die("Failed to execute internal merge");
724 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
725 blob_type
, result
.sha
))
726 die("Unable to add %s to database",
729 free(result_buf
.ptr
);
730 result
.clean
= (merge_status
== 0);
731 } else if (S_ISGITLINK(a
->mode
)) {
733 hashcpy(result
.sha
, a
->sha1
);
734 } else if (S_ISLNK(a
->mode
)) {
735 hashcpy(result
.sha
, a
->sha1
);
737 if (!sha_eq(a
->sha1
, b
->sha1
))
740 die("unsupported object type in the tree");
747 static void conflict_rename_rename(struct merge_options
*o
,
755 const char *ren1_dst
= ren1
->pair
->two
->path
;
756 const char *ren2_dst
= ren2
->pair
->two
->path
;
757 const char *dst_name1
= ren1_dst
;
758 const char *dst_name2
= ren2_dst
;
759 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
760 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
761 output(o
, 1, "%s is a directory in %s adding as %s instead",
762 ren1_dst
, branch2
, dst_name1
);
763 remove_file(o
, 0, ren1_dst
, 0);
765 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
766 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
767 output(o
, 1, "%s is a directory in %s adding as %s instead",
768 ren2_dst
, branch1
, dst_name2
);
769 remove_file(o
, 0, ren2_dst
, 0);
772 remove_file_from_cache(dst_name1
);
773 remove_file_from_cache(dst_name2
);
775 * Uncomment to leave the conflicting names in the resulting tree
777 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
778 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
781 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
782 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
788 static void conflict_rename_dir(struct merge_options
*o
,
792 char *new_path
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
793 output(o
, 1, "Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
794 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
795 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
799 static void conflict_rename_rename_2(struct merge_options
*o
,
805 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
806 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
807 output(o
, 1, "Renaming %s to %s and %s to %s instead",
808 ren1
->pair
->one
->path
, new_path1
,
809 ren2
->pair
->one
->path
, new_path2
);
810 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
811 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
812 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
817 static int process_renames(struct merge_options
*o
,
818 struct string_list
*a_renames
,
819 struct string_list
*b_renames
)
821 int clean_merge
= 1, i
, j
;
822 struct string_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
823 const struct rename
*sre
;
825 for (i
= 0; i
< a_renames
->nr
; i
++) {
826 sre
= a_renames
->items
[i
].util
;
827 string_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
830 for (i
= 0; i
< b_renames
->nr
; i
++) {
831 sre
= b_renames
->items
[i
].util
;
832 string_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
836 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
838 struct string_list
*renames1
, *renames2Dst
;
839 struct rename
*ren1
= NULL
, *ren2
= NULL
;
840 const char *branch1
, *branch2
;
841 const char *ren1_src
, *ren1_dst
;
843 if (i
>= a_renames
->nr
) {
844 ren2
= b_renames
->items
[j
++].util
;
845 } else if (j
>= b_renames
->nr
) {
846 ren1
= a_renames
->items
[i
++].util
;
848 int compare
= strcmp(a_renames
->items
[i
].string
,
849 b_renames
->items
[j
].string
);
851 ren1
= a_renames
->items
[i
++].util
;
853 ren2
= b_renames
->items
[j
++].util
;
856 /* TODO: refactor, so that 1/2 are not needed */
858 renames1
= a_renames
;
859 renames2Dst
= &b_by_dst
;
860 branch1
= o
->branch1
;
861 branch2
= o
->branch2
;
864 renames1
= b_renames
;
865 renames2Dst
= &a_by_dst
;
866 branch1
= o
->branch2
;
867 branch2
= o
->branch1
;
872 src
= ren1
->pair
->one
->path
;
874 ren1
->dst_entry
->processed
= 1;
875 ren1
->src_entry
->processed
= 1;
881 ren1_src
= ren1
->pair
->one
->path
;
882 ren1_dst
= ren1
->pair
->two
->path
;
885 const char *ren2_src
= ren2
->pair
->one
->path
;
886 const char *ren2_dst
= ren2
->pair
->two
->path
;
887 /* Renamed in 1 and renamed in 2 */
888 if (strcmp(ren1_src
, ren2_src
) != 0)
889 die("ren1.src != ren2.src");
890 ren2
->dst_entry
->processed
= 1;
892 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
894 output(o
, 1, "CONFLICT (rename/rename): "
895 "Rename \"%s\"->\"%s\" in branch \"%s\" "
896 "rename \"%s\"->\"%s\" in \"%s\"%s",
897 src
, ren1_dst
, branch1
,
898 src
, ren2_dst
, branch2
,
899 o
->call_depth
? " (left unresolved)": "");
901 remove_file_from_cache(src
);
902 update_file(o
, 0, ren1
->pair
->one
->sha1
,
903 ren1
->pair
->one
->mode
, src
);
905 conflict_rename_rename(o
, ren1
, branch1
, ren2
, branch2
);
907 struct merge_file_info mfi
;
908 remove_file(o
, 1, ren1_src
, 1);
915 if (mfi
.merge
|| !mfi
.clean
)
916 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
919 output(o
, 2, "Auto-merging %s", ren1_dst
);
922 output(o
, 1, "CONFLICT (content): merge conflict in %s",
927 update_stages(ren1_dst
,
933 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
936 /* Renamed in 1, maybe changed in 2 */
937 struct string_list_item
*item
;
938 /* we only use sha1 and mode of these */
939 struct diff_filespec src_other
, dst_other
;
940 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
942 remove_file(o
, 1, ren1_src
, o
->call_depth
|| stage
== 3);
944 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
945 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
946 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
947 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
951 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
953 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
954 " directory %s added in %s",
955 ren1_src
, ren1_dst
, branch1
,
957 conflict_rename_dir(o
, ren1
, branch1
);
958 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
960 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
962 ren1_src
, ren1_dst
, branch1
,
964 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
966 update_stages(ren1_dst
, NULL
,
967 branch1
== o
->branch1
?
968 ren1
->pair
->two
: NULL
,
969 branch1
== o
->branch1
?
970 NULL
: ren1
->pair
->two
, 1);
971 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
972 const char *new_path
;
975 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
977 ren1_src
, ren1_dst
, branch1
,
980 struct merge_file_info mfi
;
981 struct diff_filespec one
, a
, b
;
983 one
.path
= a
.path
= b
.path
=
985 hashcpy(one
.sha1
, null_sha1
);
987 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
988 a
.mode
= ren1
->pair
->two
->mode
;
989 hashcpy(b
.sha1
, dst_other
.sha1
);
990 b
.mode
= dst_other
.mode
;
991 mfi
= merge_file(o
, &one
, &a
, &b
,
994 output(o
, 1, "Adding merged %s", ren1_dst
);
1000 new_path
= unique_path(o
, ren1_dst
, branch2
);
1001 output(o
, 1, "Adding as %s instead", new_path
);
1002 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1004 } else if ((item
= string_list_lookup(ren1_dst
, renames2Dst
))) {
1007 ren2
->processed
= 1;
1008 output(o
, 1, "CONFLICT (rename/rename): "
1009 "Rename %s->%s in %s. "
1010 "Rename %s->%s in %s",
1011 ren1_src
, ren1_dst
, branch1
,
1012 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1013 conflict_rename_rename_2(o
, ren1
, branch1
, ren2
, branch2
);
1018 struct diff_filespec
*one
, *a
, *b
;
1019 struct merge_file_info mfi
;
1020 src_other
.path
= (char *)ren1_src
;
1022 one
= ren1
->pair
->one
;
1023 if (a_renames
== renames1
) {
1024 a
= ren1
->pair
->two
;
1027 b
= ren1
->pair
->two
;
1030 mfi
= merge_file(o
, one
, a
, b
,
1031 o
->branch1
, o
->branch2
);
1034 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1035 mfi
.mode
== ren1
->pair
->two
->mode
)
1037 * This messaged is part of
1038 * t6022 test. If you change
1039 * it update the test too.
1041 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1043 if (mfi
.merge
|| !mfi
.clean
)
1044 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1046 output(o
, 2, "Auto-merging %s", ren1_dst
);
1048 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1053 update_stages(ren1_dst
,
1056 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1061 string_list_clear(&a_by_dst
, 0);
1062 string_list_clear(&b_by_dst
, 0);
1067 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1069 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1072 /* Per entry merge function */
1073 static int process_entry(struct merge_options
*o
,
1074 const char *path
, struct stage_data
*entry
)
1077 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1078 print_index_entry("\tpath: ", entry);
1080 int clean_merge
= 1;
1081 unsigned o_mode
= entry
->stages
[1].mode
;
1082 unsigned a_mode
= entry
->stages
[2].mode
;
1083 unsigned b_mode
= entry
->stages
[3].mode
;
1084 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1085 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1086 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1088 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1089 /* Case A: Deleted in one */
1090 if ((!a_sha
&& !b_sha
) ||
1091 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1092 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1093 /* Deleted in both or deleted in one and
1094 * unchanged in the other */
1096 output(o
, 2, "Removing %s", path
);
1097 /* do not touch working file if it did not exist */
1098 remove_file(o
, 1, path
, !a_sha
);
1100 /* Deleted in one and changed in the other */
1103 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1104 "and modified in %s. Version %s of %s left in tree.",
1106 o
->branch2
, o
->branch2
, path
);
1107 update_file(o
, 0, b_sha
, b_mode
, path
);
1109 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1110 "and modified in %s. Version %s of %s left in tree.",
1112 o
->branch1
, o
->branch1
, path
);
1113 update_file(o
, 0, a_sha
, a_mode
, path
);
1117 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1118 (!o_sha
&& !a_sha
&& b_sha
)) {
1119 /* Case B: Added in one. */
1120 const char *add_branch
;
1121 const char *other_branch
;
1123 const unsigned char *sha
;
1127 add_branch
= o
->branch1
;
1128 other_branch
= o
->branch2
;
1131 conf
= "file/directory";
1133 add_branch
= o
->branch2
;
1134 other_branch
= o
->branch1
;
1137 conf
= "directory/file";
1139 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1140 const char *new_path
= unique_path(o
, path
, add_branch
);
1142 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1144 conf
, path
, other_branch
, path
, new_path
);
1145 remove_file(o
, 0, path
, 0);
1146 update_file(o
, 0, sha
, mode
, new_path
);
1148 output(o
, 2, "Adding %s", path
);
1149 update_file(o
, 1, sha
, mode
, path
);
1151 } else if (a_sha
&& b_sha
) {
1152 /* Case C: Added in both (check for same permissions) and */
1153 /* case D: Modified in both, but differently. */
1154 const char *reason
= "content";
1155 struct merge_file_info mfi
;
1156 struct diff_filespec one
, a
, b
;
1160 o_sha
= (unsigned char *)null_sha1
;
1162 output(o
, 2, "Auto-merging %s", path
);
1163 one
.path
= a
.path
= b
.path
= (char *)path
;
1164 hashcpy(one
.sha1
, o_sha
);
1166 hashcpy(a
.sha1
, a_sha
);
1168 hashcpy(b
.sha1
, b_sha
);
1171 mfi
= merge_file(o
, &one
, &a
, &b
,
1172 o
->branch1
, o
->branch2
);
1174 clean_merge
= mfi
.clean
;
1176 if (S_ISGITLINK(mfi
.mode
))
1177 reason
= "submodule";
1178 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1181 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1182 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1184 * this entry was deleted altogether. a_mode == 0 means
1185 * we had that path and want to actively remove it.
1187 remove_file(o
, 1, path
, !a_mode
);
1189 die("Fatal merge failure, shouldn't happen.");
1194 struct unpack_trees_error_msgs
get_porcelain_error_msgs(void)
1196 struct unpack_trees_error_msgs msgs
= {
1197 /* would_overwrite */
1198 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1199 /* not_uptodate_file */
1200 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1201 /* not_uptodate_dir */
1202 "Updating '%s' would lose untracked files in it. Aborting.",
1203 /* would_lose_untracked */
1204 "Untracked working tree file '%s' would be %s by merge. Aborting",
1205 /* bind_overlap -- will not happen here */
1208 if (advice_commit_before_merge
) {
1209 msgs
.would_overwrite
= msgs
.not_uptodate_file
=
1210 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
1211 "Please, commit your changes or stash them before you can merge.";
1216 int merge_trees(struct merge_options
*o
,
1219 struct tree
*common
,
1220 struct tree
**result
)
1224 if (o
->subtree_shift
) {
1225 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1226 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1229 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1230 output(o
, 0, "Already uptodate!");
1235 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1238 if (show(o
, 4) || o
->call_depth
)
1239 die("merging of trees %s and %s failed",
1240 sha1_to_hex(head
->object
.sha1
),
1241 sha1_to_hex(merge
->object
.sha1
));
1246 if (unmerged_cache()) {
1247 struct string_list
*entries
, *re_head
, *re_merge
;
1249 string_list_clear(&o
->current_file_set
, 1);
1250 string_list_clear(&o
->current_directory_set
, 1);
1251 get_files_dirs(o
, head
);
1252 get_files_dirs(o
, merge
);
1254 entries
= get_unmerged();
1255 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1256 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1257 clean
= process_renames(o
, re_head
, re_merge
);
1258 for (i
= 0; i
< entries
->nr
; i
++) {
1259 const char *path
= entries
->items
[i
].string
;
1260 struct stage_data
*e
= entries
->items
[i
].util
;
1262 && !process_entry(o
, path
, e
))
1266 string_list_clear(re_merge
, 0);
1267 string_list_clear(re_head
, 0);
1268 string_list_clear(entries
, 1);
1275 *result
= write_tree_from_memory(o
);
1280 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1282 struct commit_list
*next
= NULL
, *current
, *backup
;
1283 for (current
= list
; current
; current
= backup
) {
1284 backup
= current
->next
;
1285 current
->next
= next
;
1292 * Merge the commits h1 and h2, return the resulting virtual
1293 * commit object and a flag indicating the cleanness of the merge.
1295 int merge_recursive(struct merge_options
*o
,
1298 struct commit_list
*ca
,
1299 struct commit
**result
)
1301 struct commit_list
*iter
;
1302 struct commit
*merged_common_ancestors
;
1303 struct tree
*mrtree
= mrtree
;
1307 output(o
, 4, "Merging:");
1308 output_commit_title(o
, h1
);
1309 output_commit_title(o
, h2
);
1313 ca
= get_merge_bases(h1
, h2
, 1);
1314 ca
= reverse_commit_list(ca
);
1318 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1319 for (iter
= ca
; iter
; iter
= iter
->next
)
1320 output_commit_title(o
, iter
->item
);
1323 merged_common_ancestors
= pop_commit(&ca
);
1324 if (merged_common_ancestors
== NULL
) {
1325 /* if there is no common ancestor, make an empty tree */
1326 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1328 tree
->object
.parsed
= 1;
1329 tree
->object
.type
= OBJ_TREE
;
1330 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1331 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1334 for (iter
= ca
; iter
; iter
= iter
->next
) {
1335 const char *saved_b1
, *saved_b2
;
1338 * When the merge fails, the result contains files
1339 * with conflict markers. The cleanness flag is
1340 * ignored, it was never actually used, as result of
1341 * merge_trees has always overwritten it: the committed
1342 * "conflicts" were already resolved.
1345 saved_b1
= o
->branch1
;
1346 saved_b2
= o
->branch2
;
1347 o
->branch1
= "Temporary merge branch 1";
1348 o
->branch2
= "Temporary merge branch 2";
1349 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1350 NULL
, &merged_common_ancestors
);
1351 o
->branch1
= saved_b1
;
1352 o
->branch2
= saved_b2
;
1355 if (!merged_common_ancestors
)
1356 die("merge returned no commit");
1363 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1366 if (o
->call_depth
) {
1367 *result
= make_virtual_commit(mrtree
, "merged tree");
1368 commit_list_insert(h1
, &(*result
)->parents
);
1369 commit_list_insert(h2
, &(*result
)->parents
->next
);
1375 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1377 struct object
*object
;
1379 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1382 if (object
->type
== OBJ_TREE
)
1383 return make_virtual_commit((struct tree
*)object
, name
);
1384 if (object
->type
!= OBJ_COMMIT
)
1386 if (parse_commit((struct commit
*)object
))
1388 return (struct commit
*)object
;
1391 int merge_recursive_generic(struct merge_options
*o
,
1392 const unsigned char *head
,
1393 const unsigned char *merge
,
1395 const unsigned char **base_list
,
1396 struct commit
**result
)
1398 int clean
, index_fd
;
1399 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1400 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1401 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1402 struct commit_list
*ca
= NULL
;
1406 for (i
= 0; i
< num_base_list
; ++i
) {
1407 struct commit
*base
;
1408 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1409 return error("Could not parse object '%s'",
1410 sha1_to_hex(base_list
[i
]));
1411 commit_list_insert(base
, &ca
);
1415 index_fd
= hold_locked_index(lock
, 1);
1416 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1418 if (active_cache_changed
&&
1419 (write_cache(index_fd
, active_cache
, active_nr
) ||
1420 commit_locked_index(lock
)))
1421 return error("Unable to write index.");
1423 return clean
? 0 : 1;
1426 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1428 struct merge_options
*o
= cb
;
1429 if (!strcasecmp(var
, "merge.verbosity")) {
1430 o
->verbosity
= git_config_int(var
, value
);
1433 if (!strcasecmp(var
, "diff.renamelimit")) {
1434 o
->diff_rename_limit
= git_config_int(var
, value
);
1437 if (!strcasecmp(var
, "merge.renamelimit")) {
1438 o
->merge_rename_limit
= git_config_int(var
, value
);
1441 return git_xmerge_config(var
, value
, cb
);
1444 void init_merge_options(struct merge_options
*o
)
1446 memset(o
, 0, sizeof(struct merge_options
));
1448 o
->buffer_output
= 1;
1449 o
->diff_rename_limit
= -1;
1450 o
->merge_rename_limit
= -1;
1451 git_config(merge_recursive_config
, o
);
1452 if (getenv("GIT_MERGE_VERBOSITY"))
1454 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1455 if (o
->verbosity
>= 5)
1456 o
->buffer_output
= 0;
1457 strbuf_init(&o
->obuf
, 0);
1458 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1459 o
->current_file_set
.strdup_strings
= 1;
1460 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1461 o
->current_directory_set
.strdup_strings
= 1;