2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
7 #include "cache-tree.h"
11 #include "tree-walk.h"
15 #include "unpack-trees.h"
16 #include "string-list.h"
17 #include "xdiff-interface.h"
19 #include "interpolate.h"
21 #include "merge-recursive.h"
23 static int subtree_merge
;
25 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
)
27 unsigned char shifted
[20];
30 * NEEDSWORK: this limits the recursion depth to hardcoded
31 * value '2' to avoid excessive overhead.
33 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 2);
34 if (!hashcmp(two
->object
.sha1
, shifted
))
36 return lookup_tree(shifted
);
40 * A virtual commit has
41 * - (const char *)commit->util set to the name, and
42 * - *(int *)commit->object.sha1 set to the virtual id.
45 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
47 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
48 static unsigned virtual_id
= 1;
50 commit
->util
= (void*)comment
;
51 *(int*)commit
->object
.sha1
= virtual_id
++;
53 commit
->object
.parsed
= 1;
58 * Since we use get_tree_entry(), which does not put the read object into
59 * the object pool, we cannot rely on a == b.
61 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
65 return a
&& b
&& hashcmp(a
, b
) == 0;
69 * Since we want to write the index eventually, we cannot reuse the index
70 * for these (temporary) data.
77 unsigned char sha
[20];
82 static struct string_list current_file_set
= {NULL
, 0, 0, 1};
83 static struct string_list current_directory_set
= {NULL
, 0, 0, 1};
85 static int call_depth
= 0;
86 static int verbosity
= 2;
87 static int diff_rename_limit
= -1;
88 static int merge_rename_limit
= -1;
89 static int buffer_output
= 1;
90 static struct strbuf obuf
= STRBUF_INIT
;
92 static int show(int v
)
94 return (!call_depth
&& verbosity
>= v
) || verbosity
>= 5;
97 static void flush_output(void)
100 fputs(obuf
.buf
, stdout
);
105 static void output(int v
, const char *fmt
, ...)
113 strbuf_grow(&obuf
, call_depth
* 2 + 2);
114 memset(obuf
.buf
+ obuf
.len
, ' ', call_depth
* 2);
115 strbuf_setlen(&obuf
, obuf
.len
+ call_depth
* 2);
118 len
= vsnprintf(obuf
.buf
+ obuf
.len
, strbuf_avail(&obuf
), fmt
, ap
);
123 if (len
>= strbuf_avail(&obuf
)) {
124 strbuf_grow(&obuf
, len
+ 2);
126 len
= vsnprintf(obuf
.buf
+ obuf
.len
, strbuf_avail(&obuf
), fmt
, ap
);
128 if (len
>= strbuf_avail(&obuf
)) {
129 die("this should not happen, your snprintf is broken");
132 strbuf_setlen(&obuf
, obuf
.len
+ len
);
133 strbuf_add(&obuf
, "\n", 1);
138 static void output_commit_title(struct commit
*commit
)
142 for (i
= call_depth
; i
--;)
145 printf("virtual %s\n", (char *)commit
->util
);
147 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
148 if (parse_commit(commit
) != 0)
149 printf("(bad commit)\n");
153 for (s
= commit
->buffer
; *s
; s
++)
154 if (*s
== '\n' && s
[1] == '\n') {
158 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
160 printf("%.*s\n", len
, s
);
165 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
166 const char *path
, int stage
, int refresh
, int options
)
168 struct cache_entry
*ce
;
169 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
171 return error("addinfo_cache failed for path '%s'", path
);
172 return add_cache_entry(ce
, options
);
176 * This is a global variable which is used in a number of places but
177 * only written to in the 'merge' function.
179 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
180 * don't update the working directory.
181 * 0 => Leave unmerged entries in the cache and update
182 * the working directory.
184 static int index_only
= 0;
186 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
189 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
192 static int git_merge_trees(int index_only
,
198 struct tree_desc t
[3];
199 struct unpack_trees_options opts
;
201 memset(&opts
, 0, sizeof(opts
));
208 opts
.fn
= threeway_merge
;
209 opts
.src_index
= &the_index
;
210 opts
.dst_index
= &the_index
;
212 init_tree_desc_from_tree(t
+0, common
);
213 init_tree_desc_from_tree(t
+1, head
);
214 init_tree_desc_from_tree(t
+2, merge
);
216 rc
= unpack_trees(3, t
, &opts
);
217 cache_tree_free(&active_cache_tree
);
221 struct tree
*write_tree_from_memory(void)
223 struct tree
*result
= NULL
;
225 if (unmerged_cache()) {
227 output(0, "There are unmerged index entries:");
228 for (i
= 0; i
< active_nr
; i
++) {
229 struct cache_entry
*ce
= active_cache
[i
];
231 output(0, "%d %.*s", ce_stage(ce
), ce_namelen(ce
), ce
->name
);
236 if (!active_cache_tree
)
237 active_cache_tree
= cache_tree();
239 if (!cache_tree_fully_valid(active_cache_tree
) &&
240 cache_tree_update(active_cache_tree
,
241 active_cache
, active_nr
, 0, 0) < 0)
242 die("error building trees");
244 result
= lookup_tree(active_cache_tree
->sha1
);
249 static int save_files_dirs(const unsigned char *sha1
,
250 const char *base
, int baselen
, const char *path
,
251 unsigned int mode
, int stage
, void *context
)
253 int len
= strlen(path
);
254 char *newpath
= xmalloc(baselen
+ len
+ 1);
255 memcpy(newpath
, base
, baselen
);
256 memcpy(newpath
+ baselen
, path
, len
);
257 newpath
[baselen
+ len
] = '\0';
260 string_list_insert(newpath
, ¤t_directory_set
);
262 string_list_insert(newpath
, ¤t_file_set
);
265 return READ_TREE_RECURSIVE
;
268 static int get_files_dirs(struct tree
*tree
)
271 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, NULL
))
273 n
= current_file_set
.nr
+ current_directory_set
.nr
;
278 * Returns an index_entry instance which doesn't have to correspond to
279 * a real cache entry in Git's index.
281 static struct stage_data
*insert_stage_data(const char *path
,
282 struct tree
*o
, struct tree
*a
, struct tree
*b
,
283 struct string_list
*entries
)
285 struct string_list_item
*item
;
286 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
287 get_tree_entry(o
->object
.sha1
, path
,
288 e
->stages
[1].sha
, &e
->stages
[1].mode
);
289 get_tree_entry(a
->object
.sha1
, path
,
290 e
->stages
[2].sha
, &e
->stages
[2].mode
);
291 get_tree_entry(b
->object
.sha1
, path
,
292 e
->stages
[3].sha
, &e
->stages
[3].mode
);
293 item
= string_list_insert(path
, entries
);
299 * Create a dictionary mapping file names to stage_data objects. The
300 * dictionary contains one entry for every path with a non-zero stage entry.
302 static struct string_list
*get_unmerged(void)
304 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
307 unmerged
->strdup_strings
= 1;
309 for (i
= 0; i
< active_nr
; i
++) {
310 struct string_list_item
*item
;
311 struct stage_data
*e
;
312 struct cache_entry
*ce
= active_cache
[i
];
316 item
= string_list_lookup(ce
->name
, unmerged
);
318 item
= string_list_insert(ce
->name
, unmerged
);
319 item
->util
= xcalloc(1, sizeof(struct stage_data
));
322 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
323 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
331 struct diff_filepair
*pair
;
332 struct stage_data
*src_entry
;
333 struct stage_data
*dst_entry
;
334 unsigned processed
:1;
338 * Get information of all renames which occurred between 'o_tree' and
339 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
340 * 'b_tree') to be able to associate the correct cache entries with
341 * the rename information. 'tree' is always equal to either a_tree or b_tree.
343 static struct string_list
*get_renames(struct tree
*tree
,
347 struct string_list
*entries
)
350 struct string_list
*renames
;
351 struct diff_options opts
;
353 renames
= xcalloc(1, sizeof(struct string_list
));
355 DIFF_OPT_SET(&opts
, RECURSIVE
);
356 opts
.detect_rename
= DIFF_DETECT_RENAME
;
357 opts
.rename_limit
= merge_rename_limit
>= 0 ? merge_rename_limit
:
358 diff_rename_limit
>= 0 ? diff_rename_limit
:
360 opts
.warn_on_too_large_rename
= 1;
361 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
362 if (diff_setup_done(&opts
) < 0)
363 die("diff setup failed");
364 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
366 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
367 struct string_list_item
*item
;
369 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
370 if (pair
->status
!= 'R') {
371 diff_free_filepair(pair
);
374 re
= xmalloc(sizeof(*re
));
377 item
= string_list_lookup(re
->pair
->one
->path
, entries
);
379 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
380 o_tree
, a_tree
, b_tree
, entries
);
382 re
->src_entry
= item
->util
;
384 item
= string_list_lookup(re
->pair
->two
->path
, entries
);
386 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
387 o_tree
, a_tree
, b_tree
, entries
);
389 re
->dst_entry
= item
->util
;
390 item
= string_list_insert(pair
->one
->path
, renames
);
393 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
394 diff_queued_diff
.nr
= 0;
399 static int update_stages(const char *path
, struct diff_filespec
*o
,
400 struct diff_filespec
*a
, struct diff_filespec
*b
,
403 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
405 if (remove_file_from_cache(path
))
408 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
411 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
414 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
419 static int remove_path(const char *name
)
427 dirs
= xstrdup(name
);
428 while ((slash
= strrchr(name
, '/'))) {
430 if (rmdir(name
) != 0)
437 static int remove_file(int clean
, const char *path
, int no_wd
)
439 int update_cache
= index_only
|| clean
;
440 int update_working_directory
= !index_only
&& !no_wd
;
443 if (remove_file_from_cache(path
))
446 if (update_working_directory
) {
447 if (remove_path(path
) && errno
!= ENOENT
)
453 static char *unique_path(const char *path
, const char *branch
)
455 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
458 char *p
= newpath
+ strlen(path
);
459 strcpy(newpath
, path
);
465 while (string_list_has_string(¤t_file_set
, newpath
) ||
466 string_list_has_string(¤t_directory_set
, newpath
) ||
467 lstat(newpath
, &st
) == 0)
468 sprintf(p
, "_%d", suffix
++);
470 string_list_insert(newpath
, ¤t_file_set
);
474 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
477 long ret
= write_in_full(fd
, buf
, size
);
482 die("merge-recursive: %s", strerror(errno
));
484 die("merge-recursive: disk full?");
491 static int make_room_for_path(const char *path
)
494 const char *msg
= "failed to create path '%s'%s";
496 status
= safe_create_leading_directories_const(path
);
499 /* something else exists */
500 error(msg
, path
, ": perhaps a D/F conflict?");
506 /* Successful unlink is good.. */
509 /* .. and so is no existing file */
512 /* .. but not some other error (who really cares what?) */
513 return error(msg
, path
, ": perhaps a D/F conflict?");
516 static void update_file_flags(const unsigned char *sha
,
526 enum object_type type
;
530 if (S_ISGITLINK(mode
))
531 die("cannot read object %s '%s': It is a submodule!",
532 sha1_to_hex(sha
), path
);
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
;
541 strbuf_init(&strbuf
, 0);
542 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
545 buf
= strbuf_detach(&strbuf
, NULL
);
549 if (make_room_for_path(path
) < 0) {
554 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
560 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
562 die("failed to open %s: %s", path
, strerror(errno
));
563 flush_buffer(fd
, buf
, size
);
565 } else if (S_ISLNK(mode
)) {
566 char *lnk
= xmemdupz(buf
, size
);
567 safe_create_leading_directories_const(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(int clean
,
582 const unsigned char *sha
,
586 update_file_flags(sha
, mode
, path
, index_only
|| clean
, !index_only
);
589 /* Low level file merging, update and removal */
591 struct merge_file_info
593 unsigned char sha
[20];
599 static void fill_mm(const unsigned char *sha1
, mmfile_t
*mm
)
602 enum object_type type
;
604 if (!hashcmp(sha1
, null_sha1
)) {
605 mm
->ptr
= xstrdup("");
610 mm
->ptr
= read_sha1_file(sha1
, &type
, &size
);
611 if (!mm
->ptr
|| type
!= OBJ_BLOB
)
612 die("unable to read blob object %s", sha1_to_hex(sha1
));
616 static int merge_3way(mmbuffer_t
*result_buf
,
617 struct diff_filespec
*o
,
618 struct diff_filespec
*a
,
619 struct diff_filespec
*b
,
623 mmfile_t orig
, src1
, src2
;
627 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
628 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
630 fill_mm(o
->sha1
, &orig
);
631 fill_mm(a
->sha1
, &src1
);
632 fill_mm(b
->sha1
, &src2
);
634 merge_status
= ll_merge(result_buf
, a
->path
, &orig
,
635 &src1
, name1
, &src2
, name2
,
646 static struct merge_file_info
merge_file(struct diff_filespec
*o
,
647 struct diff_filespec
*a
, struct diff_filespec
*b
,
648 const char *branch1
, const char *branch2
)
650 struct merge_file_info result
;
654 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
656 if (S_ISREG(a
->mode
)) {
657 result
.mode
= a
->mode
;
658 hashcpy(result
.sha
, a
->sha1
);
660 result
.mode
= b
->mode
;
661 hashcpy(result
.sha
, b
->sha1
);
664 if (!sha_eq(a
->sha1
, o
->sha1
) && !sha_eq(b
->sha1
, o
->sha1
))
670 if (a
->mode
== b
->mode
|| a
->mode
== o
->mode
)
671 result
.mode
= b
->mode
;
673 result
.mode
= a
->mode
;
674 if (b
->mode
!= o
->mode
) {
680 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, o
->sha1
))
681 hashcpy(result
.sha
, b
->sha1
);
682 else if (sha_eq(b
->sha1
, o
->sha1
))
683 hashcpy(result
.sha
, a
->sha1
);
684 else if (S_ISREG(a
->mode
)) {
685 mmbuffer_t result_buf
;
688 merge_status
= merge_3way(&result_buf
, o
, a
, b
,
691 if ((merge_status
< 0) || !result_buf
.ptr
)
692 die("Failed to execute internal merge");
694 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
695 blob_type
, result
.sha
))
696 die("Unable to add %s to database",
699 free(result_buf
.ptr
);
700 result
.clean
= (merge_status
== 0);
701 } else if (S_ISGITLINK(a
->mode
)) {
703 hashcpy(result
.sha
, a
->sha1
);
704 } else if (S_ISLNK(a
->mode
)) {
705 hashcpy(result
.sha
, a
->sha1
);
707 if (!sha_eq(a
->sha1
, b
->sha1
))
710 die("unsupported object type in the tree");
717 static void conflict_rename_rename(struct rename
*ren1
,
724 const char *ren1_dst
= ren1
->pair
->two
->path
;
725 const char *ren2_dst
= ren2
->pair
->two
->path
;
726 const char *dst_name1
= ren1_dst
;
727 const char *dst_name2
= ren2_dst
;
728 if (string_list_has_string(¤t_directory_set
, ren1_dst
)) {
729 dst_name1
= del
[delp
++] = unique_path(ren1_dst
, branch1
);
730 output(1, "%s is a directory in %s added as %s instead",
731 ren1_dst
, branch2
, dst_name1
);
732 remove_file(0, ren1_dst
, 0);
734 if (string_list_has_string(¤t_directory_set
, ren2_dst
)) {
735 dst_name2
= del
[delp
++] = unique_path(ren2_dst
, branch2
);
736 output(1, "%s is a directory in %s added as %s instead",
737 ren2_dst
, branch1
, dst_name2
);
738 remove_file(0, ren2_dst
, 0);
741 remove_file_from_cache(dst_name1
);
742 remove_file_from_cache(dst_name2
);
744 * Uncomment to leave the conflicting names in the resulting tree
746 * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
747 * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
750 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
751 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
757 static void conflict_rename_dir(struct rename
*ren1
,
760 char *new_path
= unique_path(ren1
->pair
->two
->path
, branch1
);
761 output(1, "Renamed %s to %s instead", ren1
->pair
->one
->path
, new_path
);
762 remove_file(0, ren1
->pair
->two
->path
, 0);
763 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
767 static void conflict_rename_rename_2(struct rename
*ren1
,
772 char *new_path1
= unique_path(ren1
->pair
->two
->path
, branch1
);
773 char *new_path2
= unique_path(ren2
->pair
->two
->path
, branch2
);
774 output(1, "Renamed %s to %s and %s to %s instead",
775 ren1
->pair
->one
->path
, new_path1
,
776 ren2
->pair
->one
->path
, new_path2
);
777 remove_file(0, ren1
->pair
->two
->path
, 0);
778 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
779 update_file(0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
784 static int process_renames(struct string_list
*a_renames
,
785 struct string_list
*b_renames
,
786 const char *a_branch
,
787 const char *b_branch
)
789 int clean_merge
= 1, i
, j
;
790 struct string_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
791 const struct rename
*sre
;
793 for (i
= 0; i
< a_renames
->nr
; i
++) {
794 sre
= a_renames
->items
[i
].util
;
795 string_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
798 for (i
= 0; i
< b_renames
->nr
; i
++) {
799 sre
= b_renames
->items
[i
].util
;
800 string_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
804 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
807 struct string_list
*renames1
, *renames2
, *renames2Dst
;
808 struct rename
*ren1
= NULL
, *ren2
= NULL
;
809 const char *branch1
, *branch2
;
810 const char *ren1_src
, *ren1_dst
;
812 if (i
>= a_renames
->nr
) {
814 ren2
= b_renames
->items
[j
++].util
;
815 } else if (j
>= b_renames
->nr
) {
817 ren1
= a_renames
->items
[i
++].util
;
819 compare
= strcmp(a_renames
->items
[i
].string
,
820 b_renames
->items
[j
].string
);
822 ren1
= a_renames
->items
[i
++].util
;
824 ren2
= b_renames
->items
[j
++].util
;
827 /* TODO: refactor, so that 1/2 are not needed */
829 renames1
= a_renames
;
830 renames2
= b_renames
;
831 renames2Dst
= &b_by_dst
;
836 renames1
= b_renames
;
837 renames2
= a_renames
;
838 renames2Dst
= &a_by_dst
;
845 src
= ren1
->pair
->one
->path
;
847 ren1
->dst_entry
->processed
= 1;
848 ren1
->src_entry
->processed
= 1;
854 ren1_src
= ren1
->pair
->one
->path
;
855 ren1_dst
= ren1
->pair
->two
->path
;
858 const char *ren2_src
= ren2
->pair
->one
->path
;
859 const char *ren2_dst
= ren2
->pair
->two
->path
;
860 /* Renamed in 1 and renamed in 2 */
861 if (strcmp(ren1_src
, ren2_src
) != 0)
862 die("ren1.src != ren2.src");
863 ren2
->dst_entry
->processed
= 1;
865 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
867 output(1, "CONFLICT (rename/rename): "
868 "Rename \"%s\"->\"%s\" in branch \"%s\" "
869 "rename \"%s\"->\"%s\" in \"%s\"%s",
870 src
, ren1_dst
, branch1
,
871 src
, ren2_dst
, branch2
,
872 index_only
? " (left unresolved)": "");
874 remove_file_from_cache(src
);
875 update_file(0, ren1
->pair
->one
->sha1
,
876 ren1
->pair
->one
->mode
, src
);
878 conflict_rename_rename(ren1
, branch1
, ren2
, branch2
);
880 struct merge_file_info mfi
;
881 remove_file(1, ren1_src
, 1);
882 mfi
= merge_file(ren1
->pair
->one
,
887 if (mfi
.merge
|| !mfi
.clean
)
888 output(1, "Renamed %s->%s", src
, ren1_dst
);
891 output(2, "Auto-merged %s", ren1_dst
);
894 output(1, "CONFLICT (content): merge conflict in %s",
899 update_stages(ren1_dst
,
905 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
908 /* Renamed in 1, maybe changed in 2 */
909 struct string_list_item
*item
;
910 /* we only use sha1 and mode of these */
911 struct diff_filespec src_other
, dst_other
;
912 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
914 remove_file(1, ren1_src
, index_only
|| stage
== 3);
916 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
917 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
918 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
919 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
923 if (string_list_has_string(¤t_directory_set
, ren1_dst
)) {
925 output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s "
926 " directory %s added in %s",
927 ren1_src
, ren1_dst
, branch1
,
929 conflict_rename_dir(ren1
, branch1
);
930 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
932 output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s "
934 ren1_src
, ren1_dst
, branch1
,
936 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
937 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
938 const char *new_path
;
941 output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. "
943 ren1_src
, ren1_dst
, branch1
,
945 new_path
= unique_path(ren1_dst
, branch2
);
946 output(1, "Added as %s instead", new_path
);
947 update_file(0, dst_other
.sha1
, dst_other
.mode
, new_path
);
948 } else if ((item
= string_list_lookup(ren1_dst
, renames2Dst
))) {
952 output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. "
953 "Renamed %s->%s in %s",
954 ren1_src
, ren1_dst
, branch1
,
955 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
956 conflict_rename_rename_2(ren1
, branch1
, ren2
, branch2
);
961 struct diff_filespec
*o
, *a
, *b
;
962 struct merge_file_info mfi
;
963 src_other
.path
= (char *)ren1_src
;
966 if (a_renames
== renames1
) {
973 mfi
= merge_file(o
, a
, b
,
977 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
978 mfi
.mode
== ren1
->pair
->two
->mode
)
980 * This messaged is part of
981 * t6022 test. If you change
982 * it update the test too.
984 output(3, "Skipped %s (merged same as existing)", ren1_dst
);
986 if (mfi
.merge
|| !mfi
.clean
)
987 output(1, "Renamed %s => %s", ren1_src
, ren1_dst
);
989 output(2, "Auto-merged %s", ren1_dst
);
991 output(1, "CONFLICT (rename/modify): Merge conflict in %s",
996 update_stages(ren1_dst
,
999 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1004 string_list_clear(&a_by_dst
, 0);
1005 string_list_clear(&b_by_dst
, 0);
1010 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1012 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1015 /* Per entry merge function */
1016 static int process_entry(const char *path
, struct stage_data
*entry
,
1017 const char *branch1
,
1018 const char *branch2
)
1021 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1022 print_index_entry("\tpath: ", entry);
1024 int clean_merge
= 1;
1025 unsigned o_mode
= entry
->stages
[1].mode
;
1026 unsigned a_mode
= entry
->stages
[2].mode
;
1027 unsigned b_mode
= entry
->stages
[3].mode
;
1028 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1029 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1030 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1032 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1033 /* Case A: Deleted in one */
1034 if ((!a_sha
&& !b_sha
) ||
1035 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1036 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1037 /* Deleted in both or deleted in one and
1038 * unchanged in the other */
1040 output(2, "Removed %s", path
);
1041 /* do not touch working file if it did not exist */
1042 remove_file(1, path
, !a_sha
);
1044 /* Deleted in one and changed in the other */
1047 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1048 "and modified in %s. Version %s of %s left in tree.",
1050 branch2
, branch2
, path
);
1051 update_file(0, b_sha
, b_mode
, path
);
1053 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1054 "and modified in %s. Version %s of %s left in tree.",
1056 branch1
, branch1
, path
);
1057 update_file(0, a_sha
, a_mode
, path
);
1061 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1062 (!o_sha
&& !a_sha
&& b_sha
)) {
1063 /* Case B: Added in one. */
1064 const char *add_branch
;
1065 const char *other_branch
;
1067 const unsigned char *sha
;
1071 add_branch
= branch1
;
1072 other_branch
= branch2
;
1075 conf
= "file/directory";
1077 add_branch
= branch2
;
1078 other_branch
= branch1
;
1081 conf
= "directory/file";
1083 if (string_list_has_string(¤t_directory_set
, path
)) {
1084 const char *new_path
= unique_path(path
, add_branch
);
1086 output(1, "CONFLICT (%s): There is a directory with name %s in %s. "
1088 conf
, path
, other_branch
, path
, new_path
);
1089 remove_file(0, path
, 0);
1090 update_file(0, sha
, mode
, new_path
);
1092 output(2, "Added %s", path
);
1093 update_file(1, sha
, mode
, path
);
1095 } else if (a_sha
&& b_sha
) {
1096 /* Case C: Added in both (check for same permissions) and */
1097 /* case D: Modified in both, but differently. */
1098 const char *reason
= "content";
1099 struct merge_file_info mfi
;
1100 struct diff_filespec o
, a
, b
;
1104 o_sha
= (unsigned char *)null_sha1
;
1106 output(2, "Auto-merged %s", path
);
1107 o
.path
= a
.path
= b
.path
= (char *)path
;
1108 hashcpy(o
.sha1
, o_sha
);
1110 hashcpy(a
.sha1
, a_sha
);
1112 hashcpy(b
.sha1
, b_sha
);
1115 mfi
= merge_file(&o
, &a
, &b
,
1118 clean_merge
= mfi
.clean
;
1120 update_file(1, mfi
.sha
, mfi
.mode
, path
);
1121 else if (S_ISGITLINK(mfi
.mode
))
1122 output(1, "CONFLICT (submodule): Merge conflict in %s "
1123 "- needs %s", path
, sha1_to_hex(b
.sha1
));
1125 output(1, "CONFLICT (%s): Merge conflict in %s",
1129 update_file(0, mfi
.sha
, mfi
.mode
, path
);
1131 update_file_flags(mfi
.sha
, mfi
.mode
, path
,
1132 0 /* update_cache */, 1 /* update_working_directory */);
1134 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1136 * this entry was deleted altogether. a_mode == 0 means
1137 * we had that path and want to actively remove it.
1139 remove_file(1, path
, !a_mode
);
1141 die("Fatal merge failure, shouldn't happen.");
1146 int merge_trees(struct tree
*head
,
1148 struct tree
*common
,
1149 const char *branch1
,
1150 const char *branch2
,
1151 struct tree
**result
)
1155 if (subtree_merge
) {
1156 merge
= shift_tree_object(head
, merge
);
1157 common
= shift_tree_object(head
, common
);
1160 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1161 output(0, "Already uptodate!");
1166 code
= git_merge_trees(index_only
, common
, head
, merge
);
1169 die("merging of trees %s and %s failed",
1170 sha1_to_hex(head
->object
.sha1
),
1171 sha1_to_hex(merge
->object
.sha1
));
1173 if (unmerged_cache()) {
1174 struct string_list
*entries
, *re_head
, *re_merge
;
1176 string_list_clear(¤t_file_set
, 1);
1177 string_list_clear(¤t_directory_set
, 1);
1178 get_files_dirs(head
);
1179 get_files_dirs(merge
);
1181 entries
= get_unmerged();
1182 re_head
= get_renames(head
, common
, head
, merge
, entries
);
1183 re_merge
= get_renames(merge
, common
, head
, merge
, entries
);
1184 clean
= process_renames(re_head
, re_merge
,
1186 for (i
= 0; i
< entries
->nr
; i
++) {
1187 const char *path
= entries
->items
[i
].string
;
1188 struct stage_data
*e
= entries
->items
[i
].util
;
1190 && !process_entry(path
, e
, branch1
, branch2
))
1194 string_list_clear(re_merge
, 0);
1195 string_list_clear(re_head
, 0);
1196 string_list_clear(entries
, 1);
1203 *result
= write_tree_from_memory();
1208 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1210 struct commit_list
*next
= NULL
, *current
, *backup
;
1211 for (current
= list
; current
; current
= backup
) {
1212 backup
= current
->next
;
1213 current
->next
= next
;
1220 * Merge the commits h1 and h2, return the resulting virtual
1221 * commit object and a flag indicating the cleanness of the merge.
1223 int merge_recursive(struct commit
*h1
,
1225 const char *branch1
,
1226 const char *branch2
,
1227 struct commit_list
*ca
,
1228 struct commit
**result
)
1230 struct commit_list
*iter
;
1231 struct commit
*merged_common_ancestors
;
1232 struct tree
*mrtree
= mrtree
;
1236 output(4, "Merging:");
1237 output_commit_title(h1
);
1238 output_commit_title(h2
);
1242 ca
= get_merge_bases(h1
, h2
, 1);
1243 ca
= reverse_commit_list(ca
);
1247 output(5, "found %u common ancestor(s):", commit_list_count(ca
));
1248 for (iter
= ca
; iter
; iter
= iter
->next
)
1249 output_commit_title(iter
->item
);
1252 merged_common_ancestors
= pop_commit(&ca
);
1253 if (merged_common_ancestors
== NULL
) {
1254 /* if there is no common ancestor, make an empty tree */
1255 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1257 tree
->object
.parsed
= 1;
1258 tree
->object
.type
= OBJ_TREE
;
1259 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1260 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1263 for (iter
= ca
; iter
; iter
= iter
->next
) {
1266 * When the merge fails, the result contains files
1267 * with conflict markers. The cleanness flag is
1268 * ignored, it was never actually used, as result of
1269 * merge_trees has always overwritten it: the committed
1270 * "conflicts" were already resolved.
1273 merge_recursive(merged_common_ancestors
, iter
->item
,
1274 "Temporary merge branch 1",
1275 "Temporary merge branch 2",
1277 &merged_common_ancestors
);
1280 if (!merged_common_ancestors
)
1281 die("merge returned no commit");
1291 clean
= merge_trees(h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1292 branch1
, branch2
, &mrtree
);
1295 *result
= make_virtual_commit(mrtree
, "merged tree");
1296 commit_list_insert(h1
, &(*result
)->parents
);
1297 commit_list_insert(h2
, &(*result
)->parents
->next
);
1303 static const char *better_branch_name(const char *branch
)
1305 static char githead_env
[8 + 40 + 1];
1308 if (strlen(branch
) != 40)
1310 sprintf(githead_env
, "GITHEAD_%s", branch
);
1311 name
= getenv(githead_env
);
1312 return name
? name
: branch
;
1315 static struct commit
*get_ref(const char *ref
)
1317 unsigned char sha1
[20];
1318 struct object
*object
;
1320 if (get_sha1(ref
, sha1
))
1321 die("Could not resolve ref '%s'", ref
);
1322 object
= deref_tag(parse_object(sha1
), ref
, strlen(ref
));
1325 if (object
->type
== OBJ_TREE
)
1326 return make_virtual_commit((struct tree
*)object
,
1327 better_branch_name(ref
));
1328 if (object
->type
!= OBJ_COMMIT
)
1330 if (parse_commit((struct commit
*)object
))
1331 die("Could not parse commit '%s'", sha1_to_hex(object
->sha1
));
1332 return (struct commit
*)object
;
1335 static int merge_config(const char *var
, const char *value
, void *cb
)
1337 if (!strcasecmp(var
, "merge.verbosity")) {
1338 verbosity
= git_config_int(var
, value
);
1341 if (!strcasecmp(var
, "diff.renamelimit")) {
1342 diff_rename_limit
= git_config_int(var
, value
);
1345 if (!strcasecmp(var
, "merge.renamelimit")) {
1346 merge_rename_limit
= git_config_int(var
, value
);
1349 return git_default_config(var
, value
, cb
);
1352 int cmd_merge_recursive(int argc
, const char **argv
, const char *prefix
)
1354 static const char *bases
[20];
1355 static unsigned bases_count
= 0;
1357 const char *branch1
, *branch2
;
1358 struct commit
*result
, *h1
, *h2
;
1359 struct commit_list
*ca
= NULL
;
1360 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1364 int namelen
= strlen(argv
[0]);
1366 !strcmp(argv
[0] + namelen
- 8, "-subtree"))
1370 git_config(merge_config
, NULL
);
1371 if (getenv("GIT_MERGE_VERBOSITY"))
1372 verbosity
= strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1375 die("Usage: %s <base>... -- <head> <remote> ...\n", argv
[0]);
1377 for (i
= 1; i
< argc
; ++i
) {
1378 if (!strcmp(argv
[i
], "--"))
1380 if (bases_count
< sizeof(bases
)/sizeof(*bases
))
1381 bases
[bases_count
++] = argv
[i
];
1383 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
1384 die("Not handling anything other than two heads merge.");
1388 branch1
= argv
[++i
];
1389 branch2
= argv
[++i
];
1391 h1
= get_ref(branch1
);
1392 h2
= get_ref(branch2
);
1394 branch1
= better_branch_name(branch1
);
1395 branch2
= better_branch_name(branch2
);
1398 printf("Merging %s with %s\n", branch1
, branch2
);
1400 index_fd
= hold_locked_index(lock
, 1);
1402 for (i
= 0; i
< bases_count
; i
++) {
1403 struct commit
*ancestor
= get_ref(bases
[i
]);
1404 ca
= commit_list_insert(ancestor
, &ca
);
1406 clean
= merge_recursive(h1
, h2
, branch1
, branch2
, ca
, &result
);
1408 if (active_cache_changed
&&
1409 (write_cache(index_fd
, active_cache
, active_nr
) ||
1410 commit_locked_index(lock
)))
1411 die ("unable to write %s", get_index_file());
1413 return clean
? 0: 1;