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");
142 for (s
= commit
->buffer
; *s
; s
++)
143 if (*s
== '\n' && s
[1] == '\n') {
147 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
149 printf("%.*s\n", len
, s
);
154 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
155 const char *path
, int stage
, int refresh
, int options
)
157 struct cache_entry
*ce
;
158 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
160 return error("addinfo_cache failed for path '%s'", path
);
161 return add_cache_entry(ce
, options
);
164 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
167 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
170 static int git_merge_trees(int index_only
,
176 struct tree_desc t
[3];
177 struct unpack_trees_options opts
;
179 memset(&opts
, 0, sizeof(opts
));
186 opts
.fn
= threeway_merge
;
187 opts
.src_index
= &the_index
;
188 opts
.dst_index
= &the_index
;
189 opts
.msgs
= get_porcelain_error_msgs();
191 init_tree_desc_from_tree(t
+0, common
);
192 init_tree_desc_from_tree(t
+1, head
);
193 init_tree_desc_from_tree(t
+2, merge
);
195 rc
= unpack_trees(3, t
, &opts
);
196 cache_tree_free(&active_cache_tree
);
200 struct tree
*write_tree_from_memory(struct merge_options
*o
)
202 struct tree
*result
= NULL
;
204 if (unmerged_cache()) {
206 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
207 for (i
= 0; i
< active_nr
; i
++) {
208 struct cache_entry
*ce
= active_cache
[i
];
210 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
211 (int)ce_namelen(ce
), ce
->name
);
213 die("Bug in merge-recursive.c");
216 if (!active_cache_tree
)
217 active_cache_tree
= cache_tree();
219 if (!cache_tree_fully_valid(active_cache_tree
) &&
220 cache_tree_update(active_cache_tree
,
221 active_cache
, active_nr
, 0, 0) < 0)
222 die("error building trees");
224 result
= lookup_tree(active_cache_tree
->sha1
);
229 static int save_files_dirs(const unsigned char *sha1
,
230 const char *base
, int baselen
, const char *path
,
231 unsigned int mode
, int stage
, void *context
)
233 int len
= strlen(path
);
234 char *newpath
= xmalloc(baselen
+ len
+ 1);
235 struct merge_options
*o
= context
;
237 memcpy(newpath
, base
, baselen
);
238 memcpy(newpath
+ baselen
, path
, len
);
239 newpath
[baselen
+ len
] = '\0';
242 string_list_insert(&o
->current_directory_set
, newpath
);
244 string_list_insert(&o
->current_file_set
, newpath
);
247 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
250 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
253 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
255 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
260 * Returns an index_entry instance which doesn't have to correspond to
261 * a real cache entry in Git's index.
263 static struct stage_data
*insert_stage_data(const char *path
,
264 struct tree
*o
, struct tree
*a
, struct tree
*b
,
265 struct string_list
*entries
)
267 struct string_list_item
*item
;
268 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
269 get_tree_entry(o
->object
.sha1
, path
,
270 e
->stages
[1].sha
, &e
->stages
[1].mode
);
271 get_tree_entry(a
->object
.sha1
, path
,
272 e
->stages
[2].sha
, &e
->stages
[2].mode
);
273 get_tree_entry(b
->object
.sha1
, path
,
274 e
->stages
[3].sha
, &e
->stages
[3].mode
);
275 item
= string_list_insert(entries
, path
);
281 * Create a dictionary mapping file names to stage_data objects. The
282 * dictionary contains one entry for every path with a non-zero stage entry.
284 static struct string_list
*get_unmerged(void)
286 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
289 unmerged
->strdup_strings
= 1;
291 for (i
= 0; i
< active_nr
; i
++) {
292 struct string_list_item
*item
;
293 struct stage_data
*e
;
294 struct cache_entry
*ce
= active_cache
[i
];
298 item
= string_list_lookup(unmerged
, ce
->name
);
300 item
= string_list_insert(unmerged
, ce
->name
);
301 item
->util
= xcalloc(1, sizeof(struct stage_data
));
304 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
305 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
313 struct diff_filepair
*pair
;
314 struct stage_data
*src_entry
;
315 struct stage_data
*dst_entry
;
316 unsigned processed
:1;
320 * Get information of all renames which occurred between 'o_tree' and
321 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
322 * 'b_tree') to be able to associate the correct cache entries with
323 * the rename information. 'tree' is always equal to either a_tree or b_tree.
325 static struct string_list
*get_renames(struct merge_options
*o
,
330 struct string_list
*entries
)
333 struct string_list
*renames
;
334 struct diff_options opts
;
336 renames
= xcalloc(1, sizeof(struct string_list
));
338 DIFF_OPT_SET(&opts
, RECURSIVE
);
339 opts
.detect_rename
= DIFF_DETECT_RENAME
;
340 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
341 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
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(entries
, re
->pair
->one
->path
);
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(entries
, re
->pair
->two
->path
);
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(renames
, pair
->one
->path
);
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(&o
->current_file_set
, newpath
);
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.
539 buf
= read_sha1_file(sha
, &type
, &size
);
541 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
542 if (type
!= OBJ_BLOB
)
543 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
545 struct strbuf strbuf
= STRBUF_INIT
;
546 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
549 buf
= strbuf_detach(&strbuf
, NULL
);
553 if (make_room_for_path(path
) < 0) {
558 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
564 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
566 die_errno("failed to open '%s'", path
);
567 flush_buffer(fd
, buf
, size
);
569 } else if (S_ISLNK(mode
)) {
570 char *lnk
= xmemdupz(buf
, size
);
571 safe_create_leading_directories_const(path
);
573 if (symlink(lnk
, path
))
574 die_errno("failed to symlink '%s'", path
);
577 die("do not know what to do with %06o %s '%s'",
578 mode
, sha1_to_hex(sha
), path
);
583 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
586 static void update_file(struct merge_options
*o
,
588 const unsigned char *sha
,
592 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
595 /* Low level file merging, update and removal */
597 struct merge_file_info
599 unsigned char sha
[20];
605 static int merge_3way(struct merge_options
*o
,
606 mmbuffer_t
*result_buf
,
607 struct diff_filespec
*one
,
608 struct diff_filespec
*a
,
609 struct diff_filespec
*b
,
613 mmfile_t orig
, src1
, src2
;
614 char *base_name
, *name1
, *name2
;
621 switch (o
->recursive_variant
) {
622 case MERGE_RECURSIVE_OURS
:
623 favor
= XDL_MERGE_FAVOR_OURS
;
625 case MERGE_RECURSIVE_THEIRS
:
626 favor
= XDL_MERGE_FAVOR_THEIRS
;
634 if (strcmp(a
->path
, b
->path
) ||
635 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
636 base_name
= o
->ancestor
== NULL
? NULL
:
637 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
638 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
639 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
641 base_name
= o
->ancestor
== NULL
? NULL
:
642 xstrdup(mkpath("%s", o
->ancestor
));
643 name1
= xstrdup(mkpath("%s", branch1
));
644 name2
= xstrdup(mkpath("%s", branch2
));
647 read_mmblob(&orig
, one
->sha1
);
648 read_mmblob(&src1
, a
->sha1
);
649 read_mmblob(&src2
, b
->sha1
);
651 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
652 &src1
, name1
, &src2
, name2
,
653 (!!o
->call_depth
) | (favor
<< 1));
663 static struct merge_file_info
merge_file(struct merge_options
*o
,
664 struct diff_filespec
*one
,
665 struct diff_filespec
*a
,
666 struct diff_filespec
*b
,
670 struct merge_file_info result
;
674 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
676 if (S_ISREG(a
->mode
)) {
677 result
.mode
= a
->mode
;
678 hashcpy(result
.sha
, a
->sha1
);
680 result
.mode
= b
->mode
;
681 hashcpy(result
.sha
, b
->sha1
);
684 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
690 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
691 result
.mode
= b
->mode
;
693 result
.mode
= a
->mode
;
694 if (b
->mode
!= one
->mode
) {
700 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
701 hashcpy(result
.sha
, b
->sha1
);
702 else if (sha_eq(b
->sha1
, one
->sha1
))
703 hashcpy(result
.sha
, a
->sha1
);
704 else if (S_ISREG(a
->mode
)) {
705 mmbuffer_t result_buf
;
708 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
711 if ((merge_status
< 0) || !result_buf
.ptr
)
712 die("Failed to execute internal merge");
714 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
715 blob_type
, result
.sha
))
716 die("Unable to add %s to database",
719 free(result_buf
.ptr
);
720 result
.clean
= (merge_status
== 0);
721 } else if (S_ISGITLINK(a
->mode
)) {
722 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
724 } else if (S_ISLNK(a
->mode
)) {
725 hashcpy(result
.sha
, a
->sha1
);
727 if (!sha_eq(a
->sha1
, b
->sha1
))
730 die("unsupported object type in the tree");
737 static void conflict_rename_rename(struct merge_options
*o
,
745 const char *ren1_dst
= ren1
->pair
->two
->path
;
746 const char *ren2_dst
= ren2
->pair
->two
->path
;
747 const char *dst_name1
= ren1_dst
;
748 const char *dst_name2
= ren2_dst
;
749 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
750 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
751 output(o
, 1, "%s is a directory in %s adding as %s instead",
752 ren1_dst
, branch2
, dst_name1
);
753 remove_file(o
, 0, ren1_dst
, 0);
755 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
756 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
757 output(o
, 1, "%s is a directory in %s adding as %s instead",
758 ren2_dst
, branch1
, dst_name2
);
759 remove_file(o
, 0, ren2_dst
, 0);
762 remove_file_from_cache(dst_name1
);
763 remove_file_from_cache(dst_name2
);
765 * Uncomment to leave the conflicting names in the resulting tree
767 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
768 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
771 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
772 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
778 static void conflict_rename_dir(struct merge_options
*o
,
782 char *new_path
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
783 output(o
, 1, "Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
784 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
785 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
789 static void conflict_rename_rename_2(struct merge_options
*o
,
795 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
796 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
797 output(o
, 1, "Renaming %s to %s and %s to %s instead",
798 ren1
->pair
->one
->path
, new_path1
,
799 ren2
->pair
->one
->path
, new_path2
);
800 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
801 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
802 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
807 static int process_renames(struct merge_options
*o
,
808 struct string_list
*a_renames
,
809 struct string_list
*b_renames
)
811 int clean_merge
= 1, i
, j
;
812 struct string_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
813 const struct rename
*sre
;
815 for (i
= 0; i
< a_renames
->nr
; i
++) {
816 sre
= a_renames
->items
[i
].util
;
817 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
820 for (i
= 0; i
< b_renames
->nr
; i
++) {
821 sre
= b_renames
->items
[i
].util
;
822 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
826 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
828 struct string_list
*renames1
, *renames2Dst
;
829 struct rename
*ren1
= NULL
, *ren2
= NULL
;
830 const char *branch1
, *branch2
;
831 const char *ren1_src
, *ren1_dst
;
833 if (i
>= a_renames
->nr
) {
834 ren2
= b_renames
->items
[j
++].util
;
835 } else if (j
>= b_renames
->nr
) {
836 ren1
= a_renames
->items
[i
++].util
;
838 int compare
= strcmp(a_renames
->items
[i
].string
,
839 b_renames
->items
[j
].string
);
841 ren1
= a_renames
->items
[i
++].util
;
843 ren2
= b_renames
->items
[j
++].util
;
846 /* TODO: refactor, so that 1/2 are not needed */
848 renames1
= a_renames
;
849 renames2Dst
= &b_by_dst
;
850 branch1
= o
->branch1
;
851 branch2
= o
->branch2
;
854 renames1
= b_renames
;
855 renames2Dst
= &a_by_dst
;
856 branch1
= o
->branch2
;
857 branch2
= o
->branch1
;
862 src
= ren1
->pair
->one
->path
;
864 ren1
->dst_entry
->processed
= 1;
865 ren1
->src_entry
->processed
= 1;
871 ren1_src
= ren1
->pair
->one
->path
;
872 ren1_dst
= ren1
->pair
->two
->path
;
875 const char *ren2_src
= ren2
->pair
->one
->path
;
876 const char *ren2_dst
= ren2
->pair
->two
->path
;
877 /* Renamed in 1 and renamed in 2 */
878 if (strcmp(ren1_src
, ren2_src
) != 0)
879 die("ren1.src != ren2.src");
880 ren2
->dst_entry
->processed
= 1;
882 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
884 output(o
, 1, "CONFLICT (rename/rename): "
885 "Rename \"%s\"->\"%s\" in branch \"%s\" "
886 "rename \"%s\"->\"%s\" in \"%s\"%s",
887 src
, ren1_dst
, branch1
,
888 src
, ren2_dst
, branch2
,
889 o
->call_depth
? " (left unresolved)": "");
891 remove_file_from_cache(src
);
892 update_file(o
, 0, ren1
->pair
->one
->sha1
,
893 ren1
->pair
->one
->mode
, src
);
895 conflict_rename_rename(o
, ren1
, branch1
, ren2
, branch2
);
897 struct merge_file_info mfi
;
898 remove_file(o
, 1, ren1_src
, 1);
905 if (mfi
.merge
|| !mfi
.clean
)
906 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
909 output(o
, 2, "Auto-merging %s", ren1_dst
);
912 output(o
, 1, "CONFLICT (content): merge conflict in %s",
917 update_stages(ren1_dst
,
923 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
926 /* Renamed in 1, maybe changed in 2 */
927 struct string_list_item
*item
;
928 /* we only use sha1 and mode of these */
929 struct diff_filespec src_other
, dst_other
;
930 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
932 remove_file(o
, 1, ren1_src
, o
->call_depth
|| stage
== 3);
934 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
935 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
936 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
937 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
941 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
943 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
944 " directory %s added in %s",
945 ren1_src
, ren1_dst
, branch1
,
947 conflict_rename_dir(o
, ren1
, branch1
);
948 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
950 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
952 ren1_src
, ren1_dst
, branch1
,
954 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
956 update_stages(ren1_dst
, NULL
,
957 branch1
== o
->branch1
?
958 ren1
->pair
->two
: NULL
,
959 branch1
== o
->branch1
?
960 NULL
: ren1
->pair
->two
, 1);
961 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
962 const char *new_path
;
965 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
967 ren1_src
, ren1_dst
, branch1
,
970 struct merge_file_info mfi
;
971 struct diff_filespec one
, a
, b
;
973 one
.path
= a
.path
= b
.path
=
975 hashcpy(one
.sha1
, null_sha1
);
977 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
978 a
.mode
= ren1
->pair
->two
->mode
;
979 hashcpy(b
.sha1
, dst_other
.sha1
);
980 b
.mode
= dst_other
.mode
;
981 mfi
= merge_file(o
, &one
, &a
, &b
,
984 output(o
, 1, "Adding merged %s", ren1_dst
);
990 new_path
= unique_path(o
, ren1_dst
, branch2
);
991 output(o
, 1, "Adding as %s instead", new_path
);
992 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
994 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
998 output(o
, 1, "CONFLICT (rename/rename): "
999 "Rename %s->%s in %s. "
1000 "Rename %s->%s in %s",
1001 ren1_src
, ren1_dst
, branch1
,
1002 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1003 conflict_rename_rename_2(o
, ren1
, branch1
, ren2
, branch2
);
1008 struct diff_filespec
*one
, *a
, *b
;
1009 struct merge_file_info mfi
;
1010 src_other
.path
= (char *)ren1_src
;
1012 one
= ren1
->pair
->one
;
1013 if (a_renames
== renames1
) {
1014 a
= ren1
->pair
->two
;
1017 b
= ren1
->pair
->two
;
1020 mfi
= merge_file(o
, one
, a
, b
,
1021 o
->branch1
, o
->branch2
);
1024 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1025 mfi
.mode
== ren1
->pair
->two
->mode
)
1027 * This messaged is part of
1028 * t6022 test. If you change
1029 * it update the test too.
1031 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1033 if (mfi
.merge
|| !mfi
.clean
)
1034 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1036 output(o
, 2, "Auto-merging %s", ren1_dst
);
1038 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1043 update_stages(ren1_dst
,
1046 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1051 string_list_clear(&a_by_dst
, 0);
1052 string_list_clear(&b_by_dst
, 0);
1057 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1059 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1062 /* Per entry merge function */
1063 static int process_entry(struct merge_options
*o
,
1064 const char *path
, struct stage_data
*entry
)
1067 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1068 print_index_entry("\tpath: ", entry);
1070 int clean_merge
= 1;
1071 unsigned o_mode
= entry
->stages
[1].mode
;
1072 unsigned a_mode
= entry
->stages
[2].mode
;
1073 unsigned b_mode
= entry
->stages
[3].mode
;
1074 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1075 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1076 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1078 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1079 /* Case A: Deleted in one */
1080 if ((!a_sha
&& !b_sha
) ||
1081 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1082 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1083 /* Deleted in both or deleted in one and
1084 * unchanged in the other */
1086 output(o
, 2, "Removing %s", path
);
1087 /* do not touch working file if it did not exist */
1088 remove_file(o
, 1, path
, !a_sha
);
1090 /* Deleted in one and changed in the other */
1093 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1094 "and modified in %s. Version %s of %s left in tree.",
1096 o
->branch2
, o
->branch2
, path
);
1097 update_file(o
, 0, b_sha
, b_mode
, path
);
1099 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1100 "and modified in %s. Version %s of %s left in tree.",
1102 o
->branch1
, o
->branch1
, path
);
1103 update_file(o
, 0, a_sha
, a_mode
, path
);
1107 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1108 (!o_sha
&& !a_sha
&& b_sha
)) {
1109 /* Case B: Added in one. */
1110 const char *add_branch
;
1111 const char *other_branch
;
1113 const unsigned char *sha
;
1117 add_branch
= o
->branch1
;
1118 other_branch
= o
->branch2
;
1121 conf
= "file/directory";
1123 add_branch
= o
->branch2
;
1124 other_branch
= o
->branch1
;
1127 conf
= "directory/file";
1129 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1130 const char *new_path
= unique_path(o
, path
, add_branch
);
1132 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1134 conf
, path
, other_branch
, path
, new_path
);
1135 remove_file(o
, 0, path
, 0);
1136 update_file(o
, 0, sha
, mode
, new_path
);
1138 output(o
, 2, "Adding %s", path
);
1139 update_file(o
, 1, sha
, mode
, path
);
1141 } else if (a_sha
&& b_sha
) {
1142 /* Case C: Added in both (check for same permissions) and */
1143 /* case D: Modified in both, but differently. */
1144 const char *reason
= "content";
1145 struct merge_file_info mfi
;
1146 struct diff_filespec one
, a
, b
;
1150 o_sha
= (unsigned char *)null_sha1
;
1152 output(o
, 2, "Auto-merging %s", path
);
1153 one
.path
= a
.path
= b
.path
= (char *)path
;
1154 hashcpy(one
.sha1
, o_sha
);
1156 hashcpy(a
.sha1
, a_sha
);
1158 hashcpy(b
.sha1
, b_sha
);
1161 mfi
= merge_file(o
, &one
, &a
, &b
,
1162 o
->branch1
, o
->branch2
);
1164 clean_merge
= mfi
.clean
;
1166 if (S_ISGITLINK(mfi
.mode
))
1167 reason
= "submodule";
1168 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1171 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1172 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1174 * this entry was deleted altogether. a_mode == 0 means
1175 * we had that path and want to actively remove it.
1177 remove_file(o
, 1, path
, !a_mode
);
1179 die("Fatal merge failure, shouldn't happen.");
1184 struct unpack_trees_error_msgs
get_porcelain_error_msgs(void)
1186 struct unpack_trees_error_msgs msgs
= {
1187 /* would_overwrite */
1188 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1189 /* not_uptodate_file */
1190 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1191 /* not_uptodate_dir */
1192 "Updating '%s' would lose untracked files in it. Aborting.",
1193 /* would_lose_untracked */
1194 "Untracked working tree file '%s' would be %s by merge. Aborting",
1195 /* bind_overlap -- will not happen here */
1198 if (advice_commit_before_merge
) {
1199 msgs
.would_overwrite
= msgs
.not_uptodate_file
=
1200 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
1201 "Please, commit your changes or stash them before you can merge.";
1206 int merge_trees(struct merge_options
*o
,
1209 struct tree
*common
,
1210 struct tree
**result
)
1214 if (o
->subtree_shift
) {
1215 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1216 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1219 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1220 output(o
, 0, "Already uptodate!");
1225 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1228 if (show(o
, 4) || o
->call_depth
)
1229 die("merging of trees %s and %s failed",
1230 sha1_to_hex(head
->object
.sha1
),
1231 sha1_to_hex(merge
->object
.sha1
));
1236 if (unmerged_cache()) {
1237 struct string_list
*entries
, *re_head
, *re_merge
;
1239 string_list_clear(&o
->current_file_set
, 1);
1240 string_list_clear(&o
->current_directory_set
, 1);
1241 get_files_dirs(o
, head
);
1242 get_files_dirs(o
, merge
);
1244 entries
= get_unmerged();
1245 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1246 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1247 clean
= process_renames(o
, re_head
, re_merge
);
1248 for (i
= 0; i
< entries
->nr
; i
++) {
1249 const char *path
= entries
->items
[i
].string
;
1250 struct stage_data
*e
= entries
->items
[i
].util
;
1252 && !process_entry(o
, path
, e
))
1256 string_list_clear(re_merge
, 0);
1257 string_list_clear(re_head
, 0);
1258 string_list_clear(entries
, 1);
1265 *result
= write_tree_from_memory(o
);
1270 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1272 struct commit_list
*next
= NULL
, *current
, *backup
;
1273 for (current
= list
; current
; current
= backup
) {
1274 backup
= current
->next
;
1275 current
->next
= next
;
1282 * Merge the commits h1 and h2, return the resulting virtual
1283 * commit object and a flag indicating the cleanness of the merge.
1285 int merge_recursive(struct merge_options
*o
,
1288 struct commit_list
*ca
,
1289 struct commit
**result
)
1291 struct commit_list
*iter
;
1292 struct commit
*merged_common_ancestors
;
1293 struct tree
*mrtree
= mrtree
;
1297 output(o
, 4, "Merging:");
1298 output_commit_title(o
, h1
);
1299 output_commit_title(o
, h2
);
1303 ca
= get_merge_bases(h1
, h2
, 1);
1304 ca
= reverse_commit_list(ca
);
1308 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1309 for (iter
= ca
; iter
; iter
= iter
->next
)
1310 output_commit_title(o
, iter
->item
);
1313 merged_common_ancestors
= pop_commit(&ca
);
1314 if (merged_common_ancestors
== NULL
) {
1315 /* if there is no common ancestor, make an empty tree */
1316 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1318 tree
->object
.parsed
= 1;
1319 tree
->object
.type
= OBJ_TREE
;
1320 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1321 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1324 for (iter
= ca
; iter
; iter
= iter
->next
) {
1325 const char *saved_b1
, *saved_b2
;
1328 * When the merge fails, the result contains files
1329 * with conflict markers. The cleanness flag is
1330 * ignored, it was never actually used, as result of
1331 * merge_trees has always overwritten it: the committed
1332 * "conflicts" were already resolved.
1335 saved_b1
= o
->branch1
;
1336 saved_b2
= o
->branch2
;
1337 o
->branch1
= "Temporary merge branch 1";
1338 o
->branch2
= "Temporary merge branch 2";
1339 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1340 NULL
, &merged_common_ancestors
);
1341 o
->branch1
= saved_b1
;
1342 o
->branch2
= saved_b2
;
1345 if (!merged_common_ancestors
)
1346 die("merge returned no commit");
1353 o
->ancestor
= "merged common ancestors";
1354 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1357 if (o
->call_depth
) {
1358 *result
= make_virtual_commit(mrtree
, "merged tree");
1359 commit_list_insert(h1
, &(*result
)->parents
);
1360 commit_list_insert(h2
, &(*result
)->parents
->next
);
1366 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1368 struct object
*object
;
1370 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1373 if (object
->type
== OBJ_TREE
)
1374 return make_virtual_commit((struct tree
*)object
, name
);
1375 if (object
->type
!= OBJ_COMMIT
)
1377 if (parse_commit((struct commit
*)object
))
1379 return (struct commit
*)object
;
1382 int merge_recursive_generic(struct merge_options
*o
,
1383 const unsigned char *head
,
1384 const unsigned char *merge
,
1386 const unsigned char **base_list
,
1387 struct commit
**result
)
1389 int clean
, index_fd
;
1390 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1391 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1392 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1393 struct commit_list
*ca
= NULL
;
1397 for (i
= 0; i
< num_base_list
; ++i
) {
1398 struct commit
*base
;
1399 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1400 return error("Could not parse object '%s'",
1401 sha1_to_hex(base_list
[i
]));
1402 commit_list_insert(base
, &ca
);
1406 index_fd
= hold_locked_index(lock
, 1);
1407 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1409 if (active_cache_changed
&&
1410 (write_cache(index_fd
, active_cache
, active_nr
) ||
1411 commit_locked_index(lock
)))
1412 return error("Unable to write index.");
1414 return clean
? 0 : 1;
1417 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1419 struct merge_options
*o
= cb
;
1420 if (!strcasecmp(var
, "merge.verbosity")) {
1421 o
->verbosity
= git_config_int(var
, value
);
1424 if (!strcasecmp(var
, "diff.renamelimit")) {
1425 o
->diff_rename_limit
= git_config_int(var
, value
);
1428 if (!strcasecmp(var
, "merge.renamelimit")) {
1429 o
->merge_rename_limit
= git_config_int(var
, value
);
1432 return git_xmerge_config(var
, value
, cb
);
1435 void init_merge_options(struct merge_options
*o
)
1437 memset(o
, 0, sizeof(struct merge_options
));
1439 o
->buffer_output
= 1;
1440 o
->diff_rename_limit
= -1;
1441 o
->merge_rename_limit
= -1;
1442 git_config(merge_recursive_config
, o
);
1443 if (getenv("GIT_MERGE_VERBOSITY"))
1445 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1446 if (o
->verbosity
>= 5)
1447 o
->buffer_output
= 0;
1448 strbuf_init(&o
->obuf
, 0);
1449 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1450 o
->current_file_set
.strdup_strings
= 1;
1451 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1452 o
->current_directory_set
.strdup_strings
= 1;