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
.rename_score
= o
->rename_score
;
343 opts
.warn_on_too_large_rename
= 1;
344 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
345 if (diff_setup_done(&opts
) < 0)
346 die("diff setup failed");
347 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
349 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
350 struct string_list_item
*item
;
352 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
353 if (pair
->status
!= 'R') {
354 diff_free_filepair(pair
);
357 re
= xmalloc(sizeof(*re
));
360 item
= string_list_lookup(re
->pair
->one
->path
, entries
);
362 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
363 o_tree
, a_tree
, b_tree
, entries
);
365 re
->src_entry
= item
->util
;
367 item
= string_list_lookup(re
->pair
->two
->path
, entries
);
369 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
370 o_tree
, a_tree
, b_tree
, entries
);
372 re
->dst_entry
= item
->util
;
373 item
= string_list_insert(pair
->one
->path
, renames
);
376 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
377 diff_queued_diff
.nr
= 0;
382 static int update_stages(const char *path
, struct diff_filespec
*o
,
383 struct diff_filespec
*a
, struct diff_filespec
*b
,
386 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
388 if (remove_file_from_cache(path
))
391 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
394 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
397 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
402 static int remove_file(struct merge_options
*o
, int clean
,
403 const char *path
, int no_wd
)
405 int update_cache
= o
->call_depth
|| clean
;
406 int update_working_directory
= !o
->call_depth
&& !no_wd
;
409 if (remove_file_from_cache(path
))
412 if (update_working_directory
) {
413 if (remove_path(path
))
419 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
421 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
424 char *p
= newpath
+ strlen(path
);
425 strcpy(newpath
, path
);
431 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
432 string_list_has_string(&o
->current_directory_set
, newpath
) ||
433 lstat(newpath
, &st
) == 0)
434 sprintf(p
, "_%d", suffix
++);
436 string_list_insert(newpath
, &o
->current_file_set
);
440 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
443 long ret
= write_in_full(fd
, buf
, size
);
448 die_errno("merge-recursive");
450 die("merge-recursive: disk full?");
457 static int would_lose_untracked(const char *path
)
459 int pos
= cache_name_pos(path
, strlen(path
));
463 while (pos
< active_nr
&&
464 !strcmp(path
, active_cache
[pos
]->name
)) {
466 * If stage #0, it is definitely tracked.
467 * If it has stage #2 then it was tracked
468 * before this merge started. All other
469 * cases the path was not tracked.
471 switch (ce_stage(active_cache
[pos
])) {
478 return file_exists(path
);
481 static int make_room_for_path(const char *path
)
484 const char *msg
= "failed to create path '%s'%s";
486 status
= safe_create_leading_directories_const(path
);
489 /* something else exists */
490 error(msg
, path
, ": perhaps a D/F conflict?");
497 * Do not unlink a file in the work tree if we are not
500 if (would_lose_untracked(path
))
501 return error("refusing to lose untracked file at '%s'",
504 /* Successful unlink is good.. */
507 /* .. and so is no existing file */
510 /* .. but not some other error (who really cares what?) */
511 return error(msg
, path
, ": perhaps a D/F conflict?");
514 static void update_file_flags(struct merge_options
*o
,
515 const unsigned char *sha
,
525 enum object_type type
;
529 if (S_ISGITLINK(mode
))
531 * We may later decide to recursively descend into
532 * the submodule directory and update its index
533 * and/or work tree, but we do not do that now.
537 buf
= read_sha1_file(sha
, &type
, &size
);
539 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
540 if (type
!= OBJ_BLOB
)
541 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
543 struct strbuf strbuf
= STRBUF_INIT
;
544 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
547 buf
= strbuf_detach(&strbuf
, NULL
);
551 if (make_room_for_path(path
) < 0) {
556 if (S_ISREG(mode
) || (!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 int merge_3way(struct merge_options
*o
,
604 mmbuffer_t
*result_buf
,
605 struct diff_filespec
*one
,
606 struct diff_filespec
*a
,
607 struct diff_filespec
*b
,
611 mmfile_t orig
, src1
, src2
;
612 struct ll_merge_options ll_opts
= {0};
613 char *base_name
, *name1
, *name2
;
616 ll_opts
.renormalize
= o
->renormalize
;
617 ll_opts
.xdl_opts
= o
->xdl_opts
;
620 ll_opts
.virtual_ancestor
= 1;
623 switch (o
->recursive_variant
) {
624 case MERGE_RECURSIVE_OURS
:
625 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
627 case MERGE_RECURSIVE_THEIRS
:
628 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
636 if (strcmp(a
->path
, b
->path
) ||
637 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
638 base_name
= o
->ancestor
== NULL
? NULL
:
639 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
640 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
641 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
643 base_name
= o
->ancestor
== NULL
? NULL
:
644 xstrdup(mkpath("%s", o
->ancestor
));
645 name1
= xstrdup(mkpath("%s", branch1
));
646 name2
= xstrdup(mkpath("%s", branch2
));
649 read_mmblob(&orig
, one
->sha1
);
650 read_mmblob(&src1
, a
->sha1
);
651 read_mmblob(&src2
, b
->sha1
);
653 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
654 &src1
, name1
, &src2
, name2
, &ll_opts
);
664 static struct merge_file_info
merge_file(struct merge_options
*o
,
665 struct diff_filespec
*one
,
666 struct diff_filespec
*a
,
667 struct diff_filespec
*b
,
671 struct merge_file_info result
;
675 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
677 if (S_ISREG(a
->mode
)) {
678 result
.mode
= a
->mode
;
679 hashcpy(result
.sha
, a
->sha1
);
681 result
.mode
= b
->mode
;
682 hashcpy(result
.sha
, b
->sha1
);
685 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
691 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
692 result
.mode
= b
->mode
;
694 result
.mode
= a
->mode
;
695 if (b
->mode
!= one
->mode
) {
701 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
702 hashcpy(result
.sha
, b
->sha1
);
703 else if (sha_eq(b
->sha1
, one
->sha1
))
704 hashcpy(result
.sha
, a
->sha1
);
705 else if (S_ISREG(a
->mode
)) {
706 mmbuffer_t result_buf
;
709 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
712 if ((merge_status
< 0) || !result_buf
.ptr
)
713 die("Failed to execute internal merge");
715 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
716 blob_type
, result
.sha
))
717 die("Unable to add %s to database",
720 free(result_buf
.ptr
);
721 result
.clean
= (merge_status
== 0);
722 } else if (S_ISGITLINK(a
->mode
)) {
724 hashcpy(result
.sha
, a
->sha1
);
725 } else if (S_ISLNK(a
->mode
)) {
726 hashcpy(result
.sha
, a
->sha1
);
728 if (!sha_eq(a
->sha1
, b
->sha1
))
731 die("unsupported object type in the tree");
738 static void conflict_rename_rename(struct merge_options
*o
,
746 const char *ren1_dst
= ren1
->pair
->two
->path
;
747 const char *ren2_dst
= ren2
->pair
->two
->path
;
748 const char *dst_name1
= ren1_dst
;
749 const char *dst_name2
= ren2_dst
;
750 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
751 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
752 output(o
, 1, "%s is a directory in %s adding as %s instead",
753 ren1_dst
, branch2
, dst_name1
);
754 remove_file(o
, 0, ren1_dst
, 0);
756 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
757 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
758 output(o
, 1, "%s is a directory in %s adding as %s instead",
759 ren2_dst
, branch1
, dst_name2
);
760 remove_file(o
, 0, ren2_dst
, 0);
763 remove_file_from_cache(dst_name1
);
764 remove_file_from_cache(dst_name2
);
766 * Uncomment to leave the conflicting names in the resulting tree
768 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
769 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
772 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
773 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
779 static void conflict_rename_dir(struct merge_options
*o
,
783 char *new_path
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
784 output(o
, 1, "Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
785 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
786 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
790 static void conflict_rename_rename_2(struct merge_options
*o
,
796 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
797 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
798 output(o
, 1, "Renaming %s to %s and %s to %s instead",
799 ren1
->pair
->one
->path
, new_path1
,
800 ren2
->pair
->one
->path
, new_path2
);
801 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
802 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
803 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
808 static int process_renames(struct merge_options
*o
,
809 struct string_list
*a_renames
,
810 struct string_list
*b_renames
)
812 int clean_merge
= 1, i
, j
;
813 struct string_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
814 const struct rename
*sre
;
816 for (i
= 0; i
< a_renames
->nr
; i
++) {
817 sre
= a_renames
->items
[i
].util
;
818 string_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
821 for (i
= 0; i
< b_renames
->nr
; i
++) {
822 sre
= b_renames
->items
[i
].util
;
823 string_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
827 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
829 struct string_list
*renames1
, *renames2Dst
;
830 struct rename
*ren1
= NULL
, *ren2
= NULL
;
831 const char *branch1
, *branch2
;
832 const char *ren1_src
, *ren1_dst
;
834 if (i
>= a_renames
->nr
) {
835 ren2
= b_renames
->items
[j
++].util
;
836 } else if (j
>= b_renames
->nr
) {
837 ren1
= a_renames
->items
[i
++].util
;
839 int compare
= strcmp(a_renames
->items
[i
].string
,
840 b_renames
->items
[j
].string
);
842 ren1
= a_renames
->items
[i
++].util
;
844 ren2
= b_renames
->items
[j
++].util
;
847 /* TODO: refactor, so that 1/2 are not needed */
849 renames1
= a_renames
;
850 renames2Dst
= &b_by_dst
;
851 branch1
= o
->branch1
;
852 branch2
= o
->branch2
;
855 renames1
= b_renames
;
856 renames2Dst
= &a_by_dst
;
857 branch1
= o
->branch2
;
858 branch2
= o
->branch1
;
863 src
= ren1
->pair
->one
->path
;
865 ren1
->dst_entry
->processed
= 1;
866 ren1
->src_entry
->processed
= 1;
872 ren1_src
= ren1
->pair
->one
->path
;
873 ren1_dst
= ren1
->pair
->two
->path
;
876 const char *ren2_src
= ren2
->pair
->one
->path
;
877 const char *ren2_dst
= ren2
->pair
->two
->path
;
878 /* Renamed in 1 and renamed in 2 */
879 if (strcmp(ren1_src
, ren2_src
) != 0)
880 die("ren1.src != ren2.src");
881 ren2
->dst_entry
->processed
= 1;
883 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
885 output(o
, 1, "CONFLICT (rename/rename): "
886 "Rename \"%s\"->\"%s\" in branch \"%s\" "
887 "rename \"%s\"->\"%s\" in \"%s\"%s",
888 src
, ren1_dst
, branch1
,
889 src
, ren2_dst
, branch2
,
890 o
->call_depth
? " (left unresolved)": "");
892 remove_file_from_cache(src
);
893 update_file(o
, 0, ren1
->pair
->one
->sha1
,
894 ren1
->pair
->one
->mode
, src
);
896 conflict_rename_rename(o
, ren1
, branch1
, ren2
, branch2
);
898 struct merge_file_info mfi
;
899 remove_file(o
, 1, ren1_src
, 1);
906 if (mfi
.merge
|| !mfi
.clean
)
907 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
910 output(o
, 2, "Auto-merging %s", ren1_dst
);
913 output(o
, 1, "CONFLICT (content): merge conflict in %s",
918 update_stages(ren1_dst
,
924 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
927 /* Renamed in 1, maybe changed in 2 */
928 struct string_list_item
*item
;
929 /* we only use sha1 and mode of these */
930 struct diff_filespec src_other
, dst_other
;
931 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
933 remove_file(o
, 1, ren1_src
, o
->call_depth
|| stage
== 3);
935 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
936 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
937 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
938 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
942 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
944 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
945 " directory %s added in %s",
946 ren1_src
, ren1_dst
, branch1
,
948 conflict_rename_dir(o
, ren1
, branch1
);
949 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
951 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
953 ren1_src
, ren1_dst
, branch1
,
955 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
957 update_stages(ren1_dst
, NULL
,
958 branch1
== o
->branch1
?
959 ren1
->pair
->two
: NULL
,
960 branch1
== o
->branch1
?
961 NULL
: ren1
->pair
->two
, 1);
962 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
963 const char *new_path
;
966 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
968 ren1_src
, ren1_dst
, branch1
,
971 struct merge_file_info mfi
;
972 struct diff_filespec one
, a
, b
;
974 one
.path
= a
.path
= b
.path
=
976 hashcpy(one
.sha1
, null_sha1
);
978 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
979 a
.mode
= ren1
->pair
->two
->mode
;
980 hashcpy(b
.sha1
, dst_other
.sha1
);
981 b
.mode
= dst_other
.mode
;
982 mfi
= merge_file(o
, &one
, &a
, &b
,
985 output(o
, 1, "Adding merged %s", ren1_dst
);
991 new_path
= unique_path(o
, ren1_dst
, branch2
);
992 output(o
, 1, "Adding as %s instead", new_path
);
993 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
995 } else if ((item
= string_list_lookup(ren1_dst
, renames2Dst
))) {
999 output(o
, 1, "CONFLICT (rename/rename): "
1000 "Rename %s->%s in %s. "
1001 "Rename %s->%s in %s",
1002 ren1_src
, ren1_dst
, branch1
,
1003 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1004 conflict_rename_rename_2(o
, ren1
, branch1
, ren2
, branch2
);
1009 struct diff_filespec
*one
, *a
, *b
;
1010 struct merge_file_info mfi
;
1011 src_other
.path
= (char *)ren1_src
;
1013 one
= ren1
->pair
->one
;
1014 if (a_renames
== renames1
) {
1015 a
= ren1
->pair
->two
;
1018 b
= ren1
->pair
->two
;
1021 mfi
= merge_file(o
, one
, a
, b
,
1022 o
->branch1
, o
->branch2
);
1025 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1026 mfi
.mode
== ren1
->pair
->two
->mode
)
1028 * This messaged is part of
1029 * t6022 test. If you change
1030 * it update the test too.
1032 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1034 if (mfi
.merge
|| !mfi
.clean
)
1035 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1037 output(o
, 2, "Auto-merging %s", ren1_dst
);
1039 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1044 update_stages(ren1_dst
,
1047 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1052 string_list_clear(&a_by_dst
, 0);
1053 string_list_clear(&b_by_dst
, 0);
1058 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1060 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1063 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1066 enum object_type type
;
1068 buf
= read_sha1_file(sha1
, &type
, &size
);
1070 return error("cannot read object %s", sha1_to_hex(sha1
));
1071 if (type
!= OBJ_BLOB
) {
1073 return error("object %s is not a blob", sha1_to_hex(sha1
));
1075 strbuf_attach(dst
, buf
, size
, size
+ 1);
1079 static int blob_unchanged(const unsigned char *o_sha
,
1080 const unsigned char *a_sha
,
1081 int renormalize
, const char *path
)
1083 struct strbuf o
= STRBUF_INIT
;
1084 struct strbuf a
= STRBUF_INIT
;
1085 int ret
= 0; /* assume changed for safety */
1087 if (sha_eq(o_sha
, a_sha
))
1092 assert(o_sha
&& a_sha
);
1093 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1096 * Note: binary | is used so that both renormalizations are
1097 * performed. Comparison can be skipped if both files are
1098 * unchanged since their sha1s have already been compared.
1100 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1101 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1102 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1110 /* Per entry merge function */
1111 static int process_entry(struct merge_options
*o
,
1112 const char *path
, struct stage_data
*entry
)
1115 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1116 print_index_entry("\tpath: ", entry);
1118 int clean_merge
= 1;
1119 int normalize
= o
->renormalize
;
1120 unsigned o_mode
= entry
->stages
[1].mode
;
1121 unsigned a_mode
= entry
->stages
[2].mode
;
1122 unsigned b_mode
= entry
->stages
[3].mode
;
1123 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1124 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1125 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1127 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1128 /* Case A: Deleted in one */
1129 if ((!a_sha
&& !b_sha
) ||
1130 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1131 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1132 /* Deleted in both or deleted in one and
1133 * unchanged in the other */
1135 output(o
, 2, "Removing %s", path
);
1136 /* do not touch working file if it did not exist */
1137 remove_file(o
, 1, path
, !a_sha
);
1139 /* Deleted in one and changed in the other */
1142 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1143 "and modified in %s. Version %s of %s left in tree.",
1145 o
->branch2
, o
->branch2
, path
);
1146 update_file(o
, 0, b_sha
, b_mode
, path
);
1148 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1149 "and modified in %s. Version %s of %s left in tree.",
1151 o
->branch1
, o
->branch1
, path
);
1152 update_file(o
, 0, a_sha
, a_mode
, path
);
1156 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1157 (!o_sha
&& !a_sha
&& b_sha
)) {
1158 /* Case B: Added in one. */
1159 const char *add_branch
;
1160 const char *other_branch
;
1162 const unsigned char *sha
;
1166 add_branch
= o
->branch1
;
1167 other_branch
= o
->branch2
;
1170 conf
= "file/directory";
1172 add_branch
= o
->branch2
;
1173 other_branch
= o
->branch1
;
1176 conf
= "directory/file";
1178 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1179 const char *new_path
= unique_path(o
, path
, add_branch
);
1181 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1183 conf
, path
, other_branch
, path
, new_path
);
1184 remove_file(o
, 0, path
, 0);
1185 update_file(o
, 0, sha
, mode
, new_path
);
1187 output(o
, 2, "Adding %s", path
);
1188 update_file(o
, 1, sha
, mode
, path
);
1190 } else if (a_sha
&& b_sha
) {
1191 /* Case C: Added in both (check for same permissions) and */
1192 /* case D: Modified in both, but differently. */
1193 const char *reason
= "content";
1194 struct merge_file_info mfi
;
1195 struct diff_filespec one
, a
, b
;
1199 o_sha
= (unsigned char *)null_sha1
;
1201 output(o
, 2, "Auto-merging %s", path
);
1202 one
.path
= a
.path
= b
.path
= (char *)path
;
1203 hashcpy(one
.sha1
, o_sha
);
1205 hashcpy(a
.sha1
, a_sha
);
1207 hashcpy(b
.sha1
, b_sha
);
1210 mfi
= merge_file(o
, &one
, &a
, &b
,
1211 o
->branch1
, o
->branch2
);
1213 clean_merge
= mfi
.clean
;
1215 if (S_ISGITLINK(mfi
.mode
))
1216 reason
= "submodule";
1217 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1220 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1221 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1223 * this entry was deleted altogether. a_mode == 0 means
1224 * we had that path and want to actively remove it.
1226 remove_file(o
, 1, path
, !a_mode
);
1228 die("Fatal merge failure, shouldn't happen.");
1233 struct unpack_trees_error_msgs
get_porcelain_error_msgs(void)
1235 struct unpack_trees_error_msgs msgs
= {
1236 /* would_overwrite */
1237 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1238 /* not_uptodate_file */
1239 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1240 /* not_uptodate_dir */
1241 "Updating '%s' would lose untracked files in it. Aborting.",
1242 /* would_lose_untracked */
1243 "Untracked working tree file '%s' would be %s by merge. Aborting",
1244 /* bind_overlap -- will not happen here */
1247 if (advice_commit_before_merge
) {
1248 msgs
.would_overwrite
= msgs
.not_uptodate_file
=
1249 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
1250 "Please, commit your changes or stash them before you can merge.";
1255 int merge_trees(struct merge_options
*o
,
1258 struct tree
*common
,
1259 struct tree
**result
)
1263 if (o
->subtree_shift
) {
1264 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1265 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1268 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1269 output(o
, 0, "Already uptodate!");
1274 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1277 if (show(o
, 4) || o
->call_depth
)
1278 die("merging of trees %s and %s failed",
1279 sha1_to_hex(head
->object
.sha1
),
1280 sha1_to_hex(merge
->object
.sha1
));
1285 if (unmerged_cache()) {
1286 struct string_list
*entries
, *re_head
, *re_merge
;
1288 string_list_clear(&o
->current_file_set
, 1);
1289 string_list_clear(&o
->current_directory_set
, 1);
1290 get_files_dirs(o
, head
);
1291 get_files_dirs(o
, merge
);
1293 entries
= get_unmerged();
1294 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1295 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1296 clean
= process_renames(o
, re_head
, re_merge
);
1297 for (i
= 0; i
< entries
->nr
; i
++) {
1298 const char *path
= entries
->items
[i
].string
;
1299 struct stage_data
*e
= entries
->items
[i
].util
;
1301 && !process_entry(o
, path
, e
))
1305 string_list_clear(re_merge
, 0);
1306 string_list_clear(re_head
, 0);
1307 string_list_clear(entries
, 1);
1314 *result
= write_tree_from_memory(o
);
1319 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1321 struct commit_list
*next
= NULL
, *current
, *backup
;
1322 for (current
= list
; current
; current
= backup
) {
1323 backup
= current
->next
;
1324 current
->next
= next
;
1331 * Merge the commits h1 and h2, return the resulting virtual
1332 * commit object and a flag indicating the cleanness of the merge.
1334 int merge_recursive(struct merge_options
*o
,
1337 struct commit_list
*ca
,
1338 struct commit
**result
)
1340 struct commit_list
*iter
;
1341 struct commit
*merged_common_ancestors
;
1342 struct tree
*mrtree
= mrtree
;
1346 output(o
, 4, "Merging:");
1347 output_commit_title(o
, h1
);
1348 output_commit_title(o
, h2
);
1352 ca
= get_merge_bases(h1
, h2
, 1);
1353 ca
= reverse_commit_list(ca
);
1357 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1358 for (iter
= ca
; iter
; iter
= iter
->next
)
1359 output_commit_title(o
, iter
->item
);
1362 merged_common_ancestors
= pop_commit(&ca
);
1363 if (merged_common_ancestors
== NULL
) {
1364 /* if there is no common ancestor, make an empty tree */
1365 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1367 tree
->object
.parsed
= 1;
1368 tree
->object
.type
= OBJ_TREE
;
1369 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1370 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1373 for (iter
= ca
; iter
; iter
= iter
->next
) {
1374 const char *saved_b1
, *saved_b2
;
1377 * When the merge fails, the result contains files
1378 * with conflict markers. The cleanness flag is
1379 * ignored, it was never actually used, as result of
1380 * merge_trees has always overwritten it: the committed
1381 * "conflicts" were already resolved.
1384 saved_b1
= o
->branch1
;
1385 saved_b2
= o
->branch2
;
1386 o
->branch1
= "Temporary merge branch 1";
1387 o
->branch2
= "Temporary merge branch 2";
1388 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1389 NULL
, &merged_common_ancestors
);
1390 o
->branch1
= saved_b1
;
1391 o
->branch2
= saved_b2
;
1394 if (!merged_common_ancestors
)
1395 die("merge returned no commit");
1402 o
->ancestor
= "merged common ancestors";
1403 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1406 if (o
->call_depth
) {
1407 *result
= make_virtual_commit(mrtree
, "merged tree");
1408 commit_list_insert(h1
, &(*result
)->parents
);
1409 commit_list_insert(h2
, &(*result
)->parents
->next
);
1415 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1417 struct object
*object
;
1419 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1422 if (object
->type
== OBJ_TREE
)
1423 return make_virtual_commit((struct tree
*)object
, name
);
1424 if (object
->type
!= OBJ_COMMIT
)
1426 if (parse_commit((struct commit
*)object
))
1428 return (struct commit
*)object
;
1431 int merge_recursive_generic(struct merge_options
*o
,
1432 const unsigned char *head
,
1433 const unsigned char *merge
,
1435 const unsigned char **base_list
,
1436 struct commit
**result
)
1438 int clean
, index_fd
;
1439 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1440 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1441 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1442 struct commit_list
*ca
= NULL
;
1446 for (i
= 0; i
< num_base_list
; ++i
) {
1447 struct commit
*base
;
1448 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1449 return error("Could not parse object '%s'",
1450 sha1_to_hex(base_list
[i
]));
1451 commit_list_insert(base
, &ca
);
1455 index_fd
= hold_locked_index(lock
, 1);
1456 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1458 if (active_cache_changed
&&
1459 (write_cache(index_fd
, active_cache
, active_nr
) ||
1460 commit_locked_index(lock
)))
1461 return error("Unable to write index.");
1463 return clean
? 0 : 1;
1466 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1468 struct merge_options
*o
= cb
;
1469 if (!strcasecmp(var
, "merge.verbosity")) {
1470 o
->verbosity
= git_config_int(var
, value
);
1473 if (!strcasecmp(var
, "diff.renamelimit")) {
1474 o
->diff_rename_limit
= git_config_int(var
, value
);
1477 if (!strcasecmp(var
, "merge.renamelimit")) {
1478 o
->merge_rename_limit
= git_config_int(var
, value
);
1481 return git_xmerge_config(var
, value
, cb
);
1484 void init_merge_options(struct merge_options
*o
)
1486 memset(o
, 0, sizeof(struct merge_options
));
1488 o
->buffer_output
= 1;
1489 o
->diff_rename_limit
= -1;
1490 o
->merge_rename_limit
= -1;
1492 git_config(merge_recursive_config
, o
);
1493 if (getenv("GIT_MERGE_VERBOSITY"))
1495 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1496 if (o
->verbosity
>= 5)
1497 o
->buffer_output
= 0;
1498 strbuf_init(&o
->obuf
, 0);
1499 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1500 o
->current_file_set
.strdup_strings
= 1;
1501 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1502 o
->current_directory_set
.strdup_strings
= 1;
1505 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1509 if (!strcmp(s
, "ours"))
1510 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1511 else if (!strcmp(s
, "theirs"))
1512 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1513 else if (!strcmp(s
, "subtree"))
1514 o
->subtree_shift
= "";
1515 else if (!prefixcmp(s
, "subtree="))
1516 o
->subtree_shift
= s
+ strlen("subtree=");
1517 else if (!strcmp(s
, "patience"))
1518 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1519 else if (!strcmp(s
, "ignore-space-change"))
1520 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1521 else if (!strcmp(s
, "ignore-all-space"))
1522 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1523 else if (!strcmp(s
, "ignore-space-at-eol"))
1524 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1525 else if (!strcmp(s
, "renormalize"))
1527 else if (!strcmp(s
, "no-renormalize"))
1529 else if (!prefixcmp(s
, "rename-threshold=")) {
1530 const char *score
= s
+ strlen("rename-threshold=");
1531 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)