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
)
26 unsigned char shifted
[20];
29 * NEEDSWORK: this limits the recursion depth to hardcoded
30 * value '2' to avoid excessive overhead.
32 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 2);
33 if (!hashcmp(two
->object
.sha1
, shifted
))
35 return lookup_tree(shifted
);
39 * A virtual commit has (const char *)commit->util set to the name.
42 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
44 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
46 commit
->util
= (void*)comment
;
48 commit
->object
.parsed
= 1;
53 * Since we use get_tree_entry(), which does not put the read object into
54 * the object pool, we cannot rely on a == b.
56 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
60 return a
&& b
&& hashcmp(a
, b
) == 0;
64 * Since we want to write the index eventually, we cannot reuse the index
65 * for these (temporary) data.
72 unsigned char sha
[20];
77 static int show(struct merge_options
*o
, int v
)
79 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
82 static void flush_output(struct merge_options
*o
)
85 fputs(o
->obuf
.buf
, stdout
);
86 strbuf_reset(&o
->obuf
);
90 __attribute__((format (printf
, 3, 4)))
91 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
99 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
100 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
101 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
104 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
109 if (len
>= strbuf_avail(&o
->obuf
)) {
110 strbuf_grow(&o
->obuf
, len
+ 2);
112 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
114 if (len
>= strbuf_avail(&o
->obuf
)) {
115 die("this should not happen, your snprintf is broken");
118 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ len
);
119 strbuf_add(&o
->obuf
, "\n", 1);
120 if (!o
->buffer_output
)
124 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
128 for (i
= o
->call_depth
; i
--;)
131 printf("virtual %s\n", (char *)commit
->util
);
133 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
134 if (parse_commit(commit
) != 0)
135 printf("(bad commit)\n");
139 for (s
= commit
->buffer
; *s
; s
++)
140 if (*s
== '\n' && s
[1] == '\n') {
144 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
146 printf("%.*s\n", len
, s
);
151 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
152 const char *path
, int stage
, int refresh
, int options
)
154 struct cache_entry
*ce
;
155 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
157 return error("addinfo_cache failed for path '%s'", path
);
158 return add_cache_entry(ce
, options
);
161 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
164 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
167 static int git_merge_trees(int index_only
,
173 struct tree_desc t
[3];
174 struct unpack_trees_options opts
;
176 memset(&opts
, 0, sizeof(opts
));
183 opts
.fn
= threeway_merge
;
184 opts
.src_index
= &the_index
;
185 opts
.dst_index
= &the_index
;
186 opts
.msgs
= get_porcelain_error_msgs();
188 init_tree_desc_from_tree(t
+0, common
);
189 init_tree_desc_from_tree(t
+1, head
);
190 init_tree_desc_from_tree(t
+2, merge
);
192 rc
= unpack_trees(3, t
, &opts
);
193 cache_tree_free(&active_cache_tree
);
197 struct tree
*write_tree_from_memory(struct merge_options
*o
)
199 struct tree
*result
= NULL
;
201 if (unmerged_cache()) {
203 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
204 for (i
= 0; i
< active_nr
; i
++) {
205 struct cache_entry
*ce
= active_cache
[i
];
207 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
208 (int)ce_namelen(ce
), ce
->name
);
210 die("Bug in merge-recursive.c");
213 if (!active_cache_tree
)
214 active_cache_tree
= cache_tree();
216 if (!cache_tree_fully_valid(active_cache_tree
) &&
217 cache_tree_update(active_cache_tree
,
218 active_cache
, active_nr
, 0, 0) < 0)
219 die("error building trees");
221 result
= lookup_tree(active_cache_tree
->sha1
);
226 static int save_files_dirs(const unsigned char *sha1
,
227 const char *base
, int baselen
, const char *path
,
228 unsigned int mode
, int stage
, void *context
)
230 int len
= strlen(path
);
231 char *newpath
= xmalloc(baselen
+ len
+ 1);
232 struct merge_options
*o
= context
;
234 memcpy(newpath
, base
, baselen
);
235 memcpy(newpath
+ baselen
, path
, len
);
236 newpath
[baselen
+ len
] = '\0';
239 string_list_insert(newpath
, &o
->current_directory_set
);
241 string_list_insert(newpath
, &o
->current_file_set
);
244 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
247 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
250 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
252 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
257 * Returns an index_entry instance which doesn't have to correspond to
258 * a real cache entry in Git's index.
260 static struct stage_data
*insert_stage_data(const char *path
,
261 struct tree
*o
, struct tree
*a
, struct tree
*b
,
262 struct string_list
*entries
)
264 struct string_list_item
*item
;
265 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
266 get_tree_entry(o
->object
.sha1
, path
,
267 e
->stages
[1].sha
, &e
->stages
[1].mode
);
268 get_tree_entry(a
->object
.sha1
, path
,
269 e
->stages
[2].sha
, &e
->stages
[2].mode
);
270 get_tree_entry(b
->object
.sha1
, path
,
271 e
->stages
[3].sha
, &e
->stages
[3].mode
);
272 item
= string_list_insert(path
, entries
);
278 * Create a dictionary mapping file names to stage_data objects. The
279 * dictionary contains one entry for every path with a non-zero stage entry.
281 static struct string_list
*get_unmerged(void)
283 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
286 unmerged
->strdup_strings
= 1;
288 for (i
= 0; i
< active_nr
; i
++) {
289 struct string_list_item
*item
;
290 struct stage_data
*e
;
291 struct cache_entry
*ce
= active_cache
[i
];
295 item
= string_list_lookup(ce
->name
, unmerged
);
297 item
= string_list_insert(ce
->name
, unmerged
);
298 item
->util
= xcalloc(1, sizeof(struct stage_data
));
301 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
302 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
310 struct diff_filepair
*pair
;
311 struct stage_data
*src_entry
;
312 struct stage_data
*dst_entry
;
313 unsigned processed
:1;
317 * Get information of all renames which occurred between 'o_tree' and
318 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
319 * 'b_tree') to be able to associate the correct cache entries with
320 * the rename information. 'tree' is always equal to either a_tree or b_tree.
322 static struct string_list
*get_renames(struct merge_options
*o
,
327 struct string_list
*entries
)
330 struct string_list
*renames
;
331 struct diff_options opts
;
333 renames
= xcalloc(1, sizeof(struct string_list
));
335 DIFF_OPT_SET(&opts
, RECURSIVE
);
336 opts
.detect_rename
= DIFF_DETECT_RENAME
;
337 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
338 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
340 opts
.warn_on_too_large_rename
= 1;
341 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
342 if (diff_setup_done(&opts
) < 0)
343 die("diff setup failed");
344 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
346 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
347 struct string_list_item
*item
;
349 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
350 if (pair
->status
!= 'R') {
351 diff_free_filepair(pair
);
354 re
= xmalloc(sizeof(*re
));
357 item
= string_list_lookup(re
->pair
->one
->path
, entries
);
359 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
360 o_tree
, a_tree
, b_tree
, entries
);
362 re
->src_entry
= item
->util
;
364 item
= string_list_lookup(re
->pair
->two
->path
, entries
);
366 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
367 o_tree
, a_tree
, b_tree
, entries
);
369 re
->dst_entry
= item
->util
;
370 item
= string_list_insert(pair
->one
->path
, renames
);
373 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
374 diff_queued_diff
.nr
= 0;
379 static int update_stages(const char *path
, struct diff_filespec
*o
,
380 struct diff_filespec
*a
, struct diff_filespec
*b
,
383 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
385 if (remove_file_from_cache(path
))
388 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
391 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
394 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
399 static int remove_file(struct merge_options
*o
, int clean
,
400 const char *path
, int no_wd
)
402 int update_cache
= o
->call_depth
|| clean
;
403 int update_working_directory
= !o
->call_depth
&& !no_wd
;
406 if (remove_file_from_cache(path
))
409 if (update_working_directory
) {
410 if (remove_path(path
) && errno
!= ENOENT
)
416 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
418 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
421 char *p
= newpath
+ strlen(path
);
422 strcpy(newpath
, path
);
428 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
429 string_list_has_string(&o
->current_directory_set
, newpath
) ||
430 lstat(newpath
, &st
) == 0)
431 sprintf(p
, "_%d", suffix
++);
433 string_list_insert(newpath
, &o
->current_file_set
);
437 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
440 long ret
= write_in_full(fd
, buf
, size
);
445 die_errno("merge-recursive");
447 die("merge-recursive: disk full?");
454 static int would_lose_untracked(const char *path
)
456 int pos
= cache_name_pos(path
, strlen(path
));
460 while (pos
< active_nr
&&
461 !strcmp(path
, active_cache
[pos
]->name
)) {
463 * If stage #0, it is definitely tracked.
464 * If it has stage #2 then it was tracked
465 * before this merge started. All other
466 * cases the path was not tracked.
468 switch (ce_stage(active_cache
[pos
])) {
475 return file_exists(path
);
478 static int make_room_for_path(const char *path
)
481 const char *msg
= "failed to create path '%s'%s";
483 status
= safe_create_leading_directories_const(path
);
486 /* something else exists */
487 error(msg
, path
, ": perhaps a D/F conflict?");
494 * Do not unlink a file in the work tree if we are not
497 if (would_lose_untracked(path
))
498 return error("refusing to lose untracked file at '%s'",
501 /* Successful unlink is good.. */
504 /* .. and so is no existing file */
507 /* .. but not some other error (who really cares what?) */
508 return error(msg
, path
, ": perhaps a D/F conflict?");
511 static void update_file_flags(struct merge_options
*o
,
512 const unsigned char *sha
,
522 enum object_type type
;
526 if (S_ISGITLINK(mode
))
528 * We may later decide to recursively descend into
529 * the submodule directory and update its index
530 * and/or work tree, but we do not do that now.
534 buf
= read_sha1_file(sha
, &type
, &size
);
536 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
537 if (type
!= OBJ_BLOB
)
538 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
540 struct strbuf strbuf
= STRBUF_INIT
;
541 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
544 buf
= strbuf_detach(&strbuf
, NULL
);
548 if (make_room_for_path(path
) < 0) {
553 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
559 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
561 die_errno("failed to open '%s'", path
);
562 flush_buffer(fd
, buf
, size
);
564 } else if (S_ISLNK(mode
)) {
565 char *lnk
= xmemdupz(buf
, size
);
566 safe_create_leading_directories_const(path
);
568 if (symlink(lnk
, path
))
569 die_errno("failed to symlink '%s'", path
);
572 die("do not know what to do with %06o %s '%s'",
573 mode
, sha1_to_hex(sha
), path
);
578 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
581 static void update_file(struct merge_options
*o
,
583 const unsigned char *sha
,
587 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
590 /* Low level file merging, update and removal */
592 struct merge_file_info
594 unsigned char sha
[20];
600 static void fill_mm(const unsigned char *sha1
, mmfile_t
*mm
)
603 enum object_type type
;
605 if (!hashcmp(sha1
, null_sha1
)) {
606 mm
->ptr
= xstrdup("");
611 mm
->ptr
= read_sha1_file(sha1
, &type
, &size
);
612 if (!mm
->ptr
|| type
!= OBJ_BLOB
)
613 die("unable to read blob object %s", sha1_to_hex(sha1
));
617 static int merge_3way(struct merge_options
*o
,
618 mmbuffer_t
*result_buf
,
619 struct diff_filespec
*one
,
620 struct diff_filespec
*a
,
621 struct diff_filespec
*b
,
625 mmfile_t orig
, src1
, src2
;
629 if (strcmp(a
->path
, b
->path
)) {
630 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
631 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
633 name1
= xstrdup(mkpath("%s", branch1
));
634 name2
= xstrdup(mkpath("%s", branch2
));
637 fill_mm(one
->sha1
, &orig
);
638 fill_mm(a
->sha1
, &src1
);
639 fill_mm(b
->sha1
, &src2
);
641 merge_status
= ll_merge(result_buf
, a
->path
, &orig
,
642 &src1
, name1
, &src2
, name2
,
653 static struct merge_file_info
merge_file(struct merge_options
*o
,
654 struct diff_filespec
*one
,
655 struct diff_filespec
*a
,
656 struct diff_filespec
*b
,
660 struct merge_file_info result
;
664 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
666 if (S_ISREG(a
->mode
)) {
667 result
.mode
= a
->mode
;
668 hashcpy(result
.sha
, a
->sha1
);
670 result
.mode
= b
->mode
;
671 hashcpy(result
.sha
, b
->sha1
);
674 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
680 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
681 result
.mode
= b
->mode
;
683 result
.mode
= a
->mode
;
684 if (b
->mode
!= one
->mode
) {
690 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
691 hashcpy(result
.sha
, b
->sha1
);
692 else if (sha_eq(b
->sha1
, one
->sha1
))
693 hashcpy(result
.sha
, a
->sha1
);
694 else if (S_ISREG(a
->mode
)) {
695 mmbuffer_t result_buf
;
698 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
701 if ((merge_status
< 0) || !result_buf
.ptr
)
702 die("Failed to execute internal merge");
704 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
705 blob_type
, result
.sha
))
706 die("Unable to add %s to database",
709 free(result_buf
.ptr
);
710 result
.clean
= (merge_status
== 0);
711 } else if (S_ISGITLINK(a
->mode
)) {
713 hashcpy(result
.sha
, a
->sha1
);
714 } else if (S_ISLNK(a
->mode
)) {
715 hashcpy(result
.sha
, a
->sha1
);
717 if (!sha_eq(a
->sha1
, b
->sha1
))
720 die("unsupported object type in the tree");
727 static void conflict_rename_rename(struct merge_options
*o
,
735 const char *ren1_dst
= ren1
->pair
->two
->path
;
736 const char *ren2_dst
= ren2
->pair
->two
->path
;
737 const char *dst_name1
= ren1_dst
;
738 const char *dst_name2
= ren2_dst
;
739 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
740 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
741 output(o
, 1, "%s is a directory in %s adding as %s instead",
742 ren1_dst
, branch2
, dst_name1
);
743 remove_file(o
, 0, ren1_dst
, 0);
745 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
746 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
747 output(o
, 1, "%s is a directory in %s adding as %s instead",
748 ren2_dst
, branch1
, dst_name2
);
749 remove_file(o
, 0, ren2_dst
, 0);
752 remove_file_from_cache(dst_name1
);
753 remove_file_from_cache(dst_name2
);
755 * Uncomment to leave the conflicting names in the resulting tree
757 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
758 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
761 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
762 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
768 static void conflict_rename_dir(struct merge_options
*o
,
772 char *new_path
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
773 output(o
, 1, "Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
774 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
775 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
779 static void conflict_rename_rename_2(struct merge_options
*o
,
785 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
786 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
787 output(o
, 1, "Renaming %s to %s and %s to %s instead",
788 ren1
->pair
->one
->path
, new_path1
,
789 ren2
->pair
->one
->path
, new_path2
);
790 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
791 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
792 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
797 static int process_renames(struct merge_options
*o
,
798 struct string_list
*a_renames
,
799 struct string_list
*b_renames
)
801 int clean_merge
= 1, i
, j
;
802 struct string_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
803 const struct rename
*sre
;
805 for (i
= 0; i
< a_renames
->nr
; i
++) {
806 sre
= a_renames
->items
[i
].util
;
807 string_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
810 for (i
= 0; i
< b_renames
->nr
; i
++) {
811 sre
= b_renames
->items
[i
].util
;
812 string_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
816 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
818 struct string_list
*renames1
, *renames2Dst
;
819 struct rename
*ren1
= NULL
, *ren2
= NULL
;
820 const char *branch1
, *branch2
;
821 const char *ren1_src
, *ren1_dst
;
823 if (i
>= a_renames
->nr
) {
824 ren2
= b_renames
->items
[j
++].util
;
825 } else if (j
>= b_renames
->nr
) {
826 ren1
= a_renames
->items
[i
++].util
;
828 int compare
= strcmp(a_renames
->items
[i
].string
,
829 b_renames
->items
[j
].string
);
831 ren1
= a_renames
->items
[i
++].util
;
833 ren2
= b_renames
->items
[j
++].util
;
836 /* TODO: refactor, so that 1/2 are not needed */
838 renames1
= a_renames
;
839 renames2Dst
= &b_by_dst
;
840 branch1
= o
->branch1
;
841 branch2
= o
->branch2
;
844 renames1
= b_renames
;
845 renames2Dst
= &a_by_dst
;
846 branch1
= o
->branch2
;
847 branch2
= o
->branch1
;
852 src
= ren1
->pair
->one
->path
;
854 ren1
->dst_entry
->processed
= 1;
855 ren1
->src_entry
->processed
= 1;
861 ren1_src
= ren1
->pair
->one
->path
;
862 ren1_dst
= ren1
->pair
->two
->path
;
865 const char *ren2_src
= ren2
->pair
->one
->path
;
866 const char *ren2_dst
= ren2
->pair
->two
->path
;
867 /* Renamed in 1 and renamed in 2 */
868 if (strcmp(ren1_src
, ren2_src
) != 0)
869 die("ren1.src != ren2.src");
870 ren2
->dst_entry
->processed
= 1;
872 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
874 output(o
, 1, "CONFLICT (rename/rename): "
875 "Rename \"%s\"->\"%s\" in branch \"%s\" "
876 "rename \"%s\"->\"%s\" in \"%s\"%s",
877 src
, ren1_dst
, branch1
,
878 src
, ren2_dst
, branch2
,
879 o
->call_depth
? " (left unresolved)": "");
881 remove_file_from_cache(src
);
882 update_file(o
, 0, ren1
->pair
->one
->sha1
,
883 ren1
->pair
->one
->mode
, src
);
885 conflict_rename_rename(o
, ren1
, branch1
, ren2
, branch2
);
887 struct merge_file_info mfi
;
888 remove_file(o
, 1, ren1_src
, 1);
895 if (mfi
.merge
|| !mfi
.clean
)
896 output(o
, 1, "Renaming %s->%s", src
, ren1_dst
);
899 output(o
, 2, "Auto-merging %s", ren1_dst
);
902 output(o
, 1, "CONFLICT (content): merge conflict in %s",
907 update_stages(ren1_dst
,
913 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
916 /* Renamed in 1, maybe changed in 2 */
917 struct string_list_item
*item
;
918 /* we only use sha1 and mode of these */
919 struct diff_filespec src_other
, dst_other
;
920 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
922 remove_file(o
, 1, ren1_src
, o
->call_depth
|| stage
== 3);
924 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
925 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
926 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
927 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
931 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
933 output(o
, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
934 " directory %s added in %s",
935 ren1_src
, ren1_dst
, branch1
,
937 conflict_rename_dir(o
, ren1
, branch1
);
938 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
940 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
942 ren1_src
, ren1_dst
, branch1
,
944 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
946 update_stages(ren1_dst
, NULL
,
947 branch1
== o
->branch1
?
948 ren1
->pair
->two
: NULL
,
949 branch1
== o
->branch1
?
950 NULL
: ren1
->pair
->two
, 1);
951 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
952 const char *new_path
;
955 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
957 ren1_src
, ren1_dst
, branch1
,
960 struct merge_file_info mfi
;
961 struct diff_filespec one
, a
, b
;
963 one
.path
= a
.path
= b
.path
=
965 hashcpy(one
.sha1
, null_sha1
);
967 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
968 a
.mode
= ren1
->pair
->two
->mode
;
969 hashcpy(b
.sha1
, dst_other
.sha1
);
970 b
.mode
= dst_other
.mode
;
971 mfi
= merge_file(o
, &one
, &a
, &b
,
974 output(o
, 1, "Adding merged %s", ren1_dst
);
980 new_path
= unique_path(o
, ren1_dst
, branch2
);
981 output(o
, 1, "Adding as %s instead", new_path
);
982 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
984 } else if ((item
= string_list_lookup(ren1_dst
, renames2Dst
))) {
988 output(o
, 1, "CONFLICT (rename/rename): "
989 "Rename %s->%s in %s. "
990 "Rename %s->%s in %s",
991 ren1_src
, ren1_dst
, branch1
,
992 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
993 conflict_rename_rename_2(o
, ren1
, branch1
, ren2
, branch2
);
998 struct diff_filespec
*one
, *a
, *b
;
999 struct merge_file_info mfi
;
1000 src_other
.path
= (char *)ren1_src
;
1002 one
= ren1
->pair
->one
;
1003 if (a_renames
== renames1
) {
1004 a
= ren1
->pair
->two
;
1007 b
= ren1
->pair
->two
;
1010 mfi
= merge_file(o
, one
, a
, b
,
1011 o
->branch1
, o
->branch2
);
1014 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1015 mfi
.mode
== ren1
->pair
->two
->mode
)
1017 * This messaged is part of
1018 * t6022 test. If you change
1019 * it update the test too.
1021 output(o
, 3, "Skipped %s (merged same as existing)", ren1_dst
);
1023 if (mfi
.merge
|| !mfi
.clean
)
1024 output(o
, 1, "Renaming %s => %s", ren1_src
, ren1_dst
);
1026 output(o
, 2, "Auto-merging %s", ren1_dst
);
1028 output(o
, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1033 update_stages(ren1_dst
,
1036 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1041 string_list_clear(&a_by_dst
, 0);
1042 string_list_clear(&b_by_dst
, 0);
1047 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1049 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1052 /* Per entry merge function */
1053 static int process_entry(struct merge_options
*o
,
1054 const char *path
, struct stage_data
*entry
)
1057 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1058 print_index_entry("\tpath: ", entry);
1060 int clean_merge
= 1;
1061 unsigned o_mode
= entry
->stages
[1].mode
;
1062 unsigned a_mode
= entry
->stages
[2].mode
;
1063 unsigned b_mode
= entry
->stages
[3].mode
;
1064 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1065 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1066 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1068 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1069 /* Case A: Deleted in one */
1070 if ((!a_sha
&& !b_sha
) ||
1071 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1072 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1073 /* Deleted in both or deleted in one and
1074 * unchanged in the other */
1076 output(o
, 2, "Removing %s", path
);
1077 /* do not touch working file if it did not exist */
1078 remove_file(o
, 1, path
, !a_sha
);
1080 /* Deleted in one and changed in the other */
1083 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1084 "and modified in %s. Version %s of %s left in tree.",
1086 o
->branch2
, o
->branch2
, path
);
1087 update_file(o
, 0, b_sha
, b_mode
, path
);
1089 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1090 "and modified in %s. Version %s of %s left in tree.",
1092 o
->branch1
, o
->branch1
, path
);
1093 update_file(o
, 0, a_sha
, a_mode
, path
);
1097 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1098 (!o_sha
&& !a_sha
&& b_sha
)) {
1099 /* Case B: Added in one. */
1100 const char *add_branch
;
1101 const char *other_branch
;
1103 const unsigned char *sha
;
1107 add_branch
= o
->branch1
;
1108 other_branch
= o
->branch2
;
1111 conf
= "file/directory";
1113 add_branch
= o
->branch2
;
1114 other_branch
= o
->branch1
;
1117 conf
= "directory/file";
1119 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1120 const char *new_path
= unique_path(o
, path
, add_branch
);
1122 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1124 conf
, path
, other_branch
, path
, new_path
);
1125 remove_file(o
, 0, path
, 0);
1126 update_file(o
, 0, sha
, mode
, new_path
);
1128 output(o
, 2, "Adding %s", path
);
1129 update_file(o
, 1, sha
, mode
, path
);
1131 } else if (a_sha
&& b_sha
) {
1132 /* Case C: Added in both (check for same permissions) and */
1133 /* case D: Modified in both, but differently. */
1134 const char *reason
= "content";
1135 struct merge_file_info mfi
;
1136 struct diff_filespec one
, a
, b
;
1140 o_sha
= (unsigned char *)null_sha1
;
1142 output(o
, 2, "Auto-merging %s", path
);
1143 one
.path
= a
.path
= b
.path
= (char *)path
;
1144 hashcpy(one
.sha1
, o_sha
);
1146 hashcpy(a
.sha1
, a_sha
);
1148 hashcpy(b
.sha1
, b_sha
);
1151 mfi
= merge_file(o
, &one
, &a
, &b
,
1152 o
->branch1
, o
->branch2
);
1154 clean_merge
= mfi
.clean
;
1156 if (S_ISGITLINK(mfi
.mode
))
1157 reason
= "submodule";
1158 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1161 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1162 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1164 * this entry was deleted altogether. a_mode == 0 means
1165 * we had that path and want to actively remove it.
1167 remove_file(o
, 1, path
, !a_mode
);
1169 die("Fatal merge failure, shouldn't happen.");
1174 struct unpack_trees_error_msgs
get_porcelain_error_msgs(void)
1176 struct unpack_trees_error_msgs msgs
= {
1177 /* would_overwrite */
1178 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1179 /* not_uptodate_file */
1180 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1181 /* not_uptodate_dir */
1182 "Updating '%s' would lose untracked files in it. Aborting.",
1183 /* would_lose_untracked */
1184 "Untracked working tree file '%s' would be %s by merge. Aborting",
1185 /* bind_overlap -- will not happen here */
1188 if (advice_commit_before_merge
) {
1189 msgs
.would_overwrite
= msgs
.not_uptodate_file
=
1190 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
1191 "Please, commit your changes or stash them before you can merge.";
1196 int merge_trees(struct merge_options
*o
,
1199 struct tree
*common
,
1200 struct tree
**result
)
1204 if (o
->subtree_merge
) {
1205 merge
= shift_tree_object(head
, merge
);
1206 common
= shift_tree_object(head
, common
);
1209 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1210 output(o
, 0, "Already uptodate!");
1215 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1218 if (show(o
, 4) || o
->call_depth
)
1219 die("merging of trees %s and %s failed",
1220 sha1_to_hex(head
->object
.sha1
),
1221 sha1_to_hex(merge
->object
.sha1
));
1226 if (unmerged_cache()) {
1227 struct string_list
*entries
, *re_head
, *re_merge
;
1229 string_list_clear(&o
->current_file_set
, 1);
1230 string_list_clear(&o
->current_directory_set
, 1);
1231 get_files_dirs(o
, head
);
1232 get_files_dirs(o
, merge
);
1234 entries
= get_unmerged();
1235 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1236 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1237 clean
= process_renames(o
, re_head
, re_merge
);
1238 for (i
= 0; i
< entries
->nr
; i
++) {
1239 const char *path
= entries
->items
[i
].string
;
1240 struct stage_data
*e
= entries
->items
[i
].util
;
1242 && !process_entry(o
, path
, e
))
1246 string_list_clear(re_merge
, 0);
1247 string_list_clear(re_head
, 0);
1248 string_list_clear(entries
, 1);
1255 *result
= write_tree_from_memory(o
);
1260 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1262 struct commit_list
*next
= NULL
, *current
, *backup
;
1263 for (current
= list
; current
; current
= backup
) {
1264 backup
= current
->next
;
1265 current
->next
= next
;
1272 * Merge the commits h1 and h2, return the resulting virtual
1273 * commit object and a flag indicating the cleanness of the merge.
1275 int merge_recursive(struct merge_options
*o
,
1278 struct commit_list
*ca
,
1279 struct commit
**result
)
1281 struct commit_list
*iter
;
1282 struct commit
*merged_common_ancestors
;
1283 struct tree
*mrtree
= mrtree
;
1287 output(o
, 4, "Merging:");
1288 output_commit_title(o
, h1
);
1289 output_commit_title(o
, h2
);
1293 ca
= get_merge_bases(h1
, h2
, 1);
1294 ca
= reverse_commit_list(ca
);
1298 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1299 for (iter
= ca
; iter
; iter
= iter
->next
)
1300 output_commit_title(o
, iter
->item
);
1303 merged_common_ancestors
= pop_commit(&ca
);
1304 if (merged_common_ancestors
== NULL
) {
1305 /* if there is no common ancestor, make an empty tree */
1306 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1308 tree
->object
.parsed
= 1;
1309 tree
->object
.type
= OBJ_TREE
;
1310 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1311 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1314 for (iter
= ca
; iter
; iter
= iter
->next
) {
1315 const char *saved_b1
, *saved_b2
;
1318 * When the merge fails, the result contains files
1319 * with conflict markers. The cleanness flag is
1320 * ignored, it was never actually used, as result of
1321 * merge_trees has always overwritten it: the committed
1322 * "conflicts" were already resolved.
1325 saved_b1
= o
->branch1
;
1326 saved_b2
= o
->branch2
;
1327 o
->branch1
= "Temporary merge branch 1";
1328 o
->branch2
= "Temporary merge branch 2";
1329 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1330 NULL
, &merged_common_ancestors
);
1331 o
->branch1
= saved_b1
;
1332 o
->branch2
= saved_b2
;
1335 if (!merged_common_ancestors
)
1336 die("merge returned no commit");
1343 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1346 if (o
->call_depth
) {
1347 *result
= make_virtual_commit(mrtree
, "merged tree");
1348 commit_list_insert(h1
, &(*result
)->parents
);
1349 commit_list_insert(h2
, &(*result
)->parents
->next
);
1355 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1357 struct object
*object
;
1359 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1362 if (object
->type
== OBJ_TREE
)
1363 return make_virtual_commit((struct tree
*)object
, name
);
1364 if (object
->type
!= OBJ_COMMIT
)
1366 if (parse_commit((struct commit
*)object
))
1368 return (struct commit
*)object
;
1371 int merge_recursive_generic(struct merge_options
*o
,
1372 const unsigned char *head
,
1373 const unsigned char *merge
,
1375 const unsigned char **base_list
,
1376 struct commit
**result
)
1378 int clean
, index_fd
;
1379 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1380 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1381 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1382 struct commit_list
*ca
= NULL
;
1386 for (i
= 0; i
< num_base_list
; ++i
) {
1387 struct commit
*base
;
1388 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1389 return error("Could not parse object '%s'",
1390 sha1_to_hex(base_list
[i
]));
1391 commit_list_insert(base
, &ca
);
1395 index_fd
= hold_locked_index(lock
, 1);
1396 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1398 if (active_cache_changed
&&
1399 (write_cache(index_fd
, active_cache
, active_nr
) ||
1400 commit_locked_index(lock
)))
1401 return error("Unable to write index.");
1403 return clean
? 0 : 1;
1406 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1408 struct merge_options
*o
= cb
;
1409 if (!strcasecmp(var
, "merge.verbosity")) {
1410 o
->verbosity
= git_config_int(var
, value
);
1413 if (!strcasecmp(var
, "diff.renamelimit")) {
1414 o
->diff_rename_limit
= git_config_int(var
, value
);
1417 if (!strcasecmp(var
, "merge.renamelimit")) {
1418 o
->merge_rename_limit
= git_config_int(var
, value
);
1421 return git_xmerge_config(var
, value
, cb
);
1424 void init_merge_options(struct merge_options
*o
)
1426 memset(o
, 0, sizeof(struct merge_options
));
1428 o
->buffer_output
= 1;
1429 o
->diff_rename_limit
= -1;
1430 o
->merge_rename_limit
= -1;
1431 git_config(merge_recursive_config
, o
);
1432 if (getenv("GIT_MERGE_VERBOSITY"))
1434 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1435 if (o
->verbosity
>= 5)
1436 o
->buffer_output
= 0;
1437 strbuf_init(&o
->obuf
, 0);
1438 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1439 o
->current_file_set
.strdup_strings
= 1;
1440 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1441 o
->current_directory_set
.strdup_strings
= 1;