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 const char rename_limit_advice
[] =
26 "inexact rename detection was skipped because there were too many\n"
27 " files. You may want to set your merge.renamelimit variable to at least\n"
28 " %d and retry this merge.";
30 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
31 const char *subtree_shift
)
33 unsigned char shifted
[20];
35 if (!*subtree_shift
) {
36 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 0);
38 shift_tree_by(one
->object
.sha1
, two
->object
.sha1
, shifted
,
41 if (!hashcmp(two
->object
.sha1
, shifted
))
43 return lookup_tree(shifted
);
47 * A virtual commit has (const char *)commit->util set to the name.
50 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
52 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
54 commit
->util
= (void*)comment
;
56 commit
->object
.parsed
= 1;
61 * Since we use get_tree_entry(), which does not put the read object into
62 * the object pool, we cannot rely on a == b.
64 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
68 return a
&& b
&& hashcmp(a
, b
) == 0;
74 RENAME_ONE_FILE_TO_TWO
77 struct rename_df_conflict_info
{
78 enum rename_type rename_type
;
79 struct diff_filepair
*pair1
;
80 struct diff_filepair
*pair2
;
83 struct stage_data
*dst_entry1
;
84 struct stage_data
*dst_entry2
;
88 * Since we want to write the index eventually, we cannot reuse the index
89 * for these (temporary) data.
96 unsigned char sha
[20];
98 struct rename_df_conflict_info
*rename_df_conflict_info
;
102 static inline void setup_rename_df_conflict_info(enum rename_type rename_type
,
103 struct diff_filepair
*pair1
,
104 struct diff_filepair
*pair2
,
107 struct stage_data
*dst_entry1
,
108 struct stage_data
*dst_entry2
)
110 struct rename_df_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_df_conflict_info
));
111 ci
->rename_type
= rename_type
;
113 ci
->branch1
= branch1
;
114 ci
->branch2
= branch2
;
116 ci
->dst_entry1
= dst_entry1
;
117 dst_entry1
->rename_df_conflict_info
= ci
;
118 dst_entry1
->processed
= 0;
120 assert(!pair2
== !dst_entry2
);
122 ci
->dst_entry2
= dst_entry2
;
124 dst_entry2
->rename_df_conflict_info
= ci
;
125 dst_entry2
->processed
= 0;
129 static int show(struct merge_options
*o
, int v
)
131 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
134 static void flush_output(struct merge_options
*o
)
137 fputs(o
->obuf
.buf
, stdout
);
138 strbuf_reset(&o
->obuf
);
142 __attribute__((format (printf
, 3, 4)))
143 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
151 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
152 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
153 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
156 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
161 if (len
>= strbuf_avail(&o
->obuf
)) {
162 strbuf_grow(&o
->obuf
, len
+ 2);
164 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
166 if (len
>= strbuf_avail(&o
->obuf
)) {
167 die("this should not happen, your snprintf is broken");
170 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ len
);
171 strbuf_add(&o
->obuf
, "\n", 1);
172 if (!o
->buffer_output
)
176 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
180 for (i
= o
->call_depth
; i
--;)
183 printf("virtual %s\n", (char *)commit
->util
);
185 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
186 if (parse_commit(commit
) != 0)
187 printf("(bad commit)\n");
190 int len
= find_commit_subject(commit
->buffer
, &title
);
192 printf("%.*s\n", len
, title
);
197 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
198 const char *path
, int stage
, int refresh
, int options
)
200 struct cache_entry
*ce
;
201 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
203 return error("addinfo_cache failed for path '%s'", path
);
204 return add_cache_entry(ce
, options
);
207 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
210 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
213 static int git_merge_trees(int index_only
,
219 struct tree_desc t
[3];
220 struct unpack_trees_options opts
;
222 memset(&opts
, 0, sizeof(opts
));
229 opts
.fn
= threeway_merge
;
230 opts
.src_index
= &the_index
;
231 opts
.dst_index
= &the_index
;
232 setup_unpack_trees_porcelain(&opts
, "merge");
234 init_tree_desc_from_tree(t
+0, common
);
235 init_tree_desc_from_tree(t
+1, head
);
236 init_tree_desc_from_tree(t
+2, merge
);
238 rc
= unpack_trees(3, t
, &opts
);
239 cache_tree_free(&active_cache_tree
);
243 struct tree
*write_tree_from_memory(struct merge_options
*o
)
245 struct tree
*result
= NULL
;
247 if (unmerged_cache()) {
249 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
250 for (i
= 0; i
< active_nr
; i
++) {
251 struct cache_entry
*ce
= active_cache
[i
];
253 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
254 (int)ce_namelen(ce
), ce
->name
);
256 die("Bug in merge-recursive.c");
259 if (!active_cache_tree
)
260 active_cache_tree
= cache_tree();
262 if (!cache_tree_fully_valid(active_cache_tree
) &&
263 cache_tree_update(active_cache_tree
,
264 active_cache
, active_nr
, 0, 0) < 0)
265 die("error building trees");
267 result
= lookup_tree(active_cache_tree
->sha1
);
272 static int save_files_dirs(const unsigned char *sha1
,
273 const char *base
, int baselen
, const char *path
,
274 unsigned int mode
, int stage
, void *context
)
276 int len
= strlen(path
);
277 char *newpath
= xmalloc(baselen
+ len
+ 1);
278 struct merge_options
*o
= context
;
280 memcpy(newpath
, base
, baselen
);
281 memcpy(newpath
+ baselen
, path
, len
);
282 newpath
[baselen
+ len
] = '\0';
285 string_list_insert(&o
->current_directory_set
, newpath
);
287 string_list_insert(&o
->current_file_set
, newpath
);
290 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
293 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
296 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
298 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
303 * Returns an index_entry instance which doesn't have to correspond to
304 * a real cache entry in Git's index.
306 static struct stage_data
*insert_stage_data(const char *path
,
307 struct tree
*o
, struct tree
*a
, struct tree
*b
,
308 struct string_list
*entries
)
310 struct string_list_item
*item
;
311 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
312 get_tree_entry(o
->object
.sha1
, path
,
313 e
->stages
[1].sha
, &e
->stages
[1].mode
);
314 get_tree_entry(a
->object
.sha1
, path
,
315 e
->stages
[2].sha
, &e
->stages
[2].mode
);
316 get_tree_entry(b
->object
.sha1
, path
,
317 e
->stages
[3].sha
, &e
->stages
[3].mode
);
318 item
= string_list_insert(entries
, path
);
324 * Create a dictionary mapping file names to stage_data objects. The
325 * dictionary contains one entry for every path with a non-zero stage entry.
327 static struct string_list
*get_unmerged(void)
329 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
332 unmerged
->strdup_strings
= 1;
334 for (i
= 0; i
< active_nr
; i
++) {
335 struct string_list_item
*item
;
336 struct stage_data
*e
;
337 struct cache_entry
*ce
= active_cache
[i
];
341 item
= string_list_lookup(unmerged
, ce
->name
);
343 item
= string_list_insert(unmerged
, ce
->name
);
344 item
->util
= xcalloc(1, sizeof(struct stage_data
));
347 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
348 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
354 static void make_room_for_directories_of_df_conflicts(struct merge_options
*o
,
355 struct string_list
*entries
)
357 /* If there are D/F conflicts, and the paths currently exist
358 * in the working copy as a file, we want to remove them to
359 * make room for the corresponding directory. Such paths will
360 * later be processed in process_df_entry() at the end. If
361 * the corresponding directory ends up being removed by the
362 * merge, then the file will be reinstated at that time;
363 * otherwise, if the file is not supposed to be removed by the
364 * merge, the contents of the file will be placed in another
367 * NOTE: This function relies on the fact that entries for a
368 * D/F conflict will appear adjacent in the index, with the
369 * entries for the file appearing before entries for paths
370 * below the corresponding directory.
372 const char *last_file
= NULL
;
374 struct stage_data
*last_e
;
377 for (i
= 0; i
< entries
->nr
; i
++) {
378 const char *path
= entries
->items
[i
].string
;
379 int len
= strlen(path
);
380 struct stage_data
*e
= entries
->items
[i
].util
;
383 * Check if last_file & path correspond to a D/F conflict;
384 * i.e. whether path is last_file+'/'+<something>.
385 * If so, remove last_file to make room for path and friends.
389 memcmp(path
, last_file
, last_len
) == 0 &&
390 path
[last_len
] == '/') {
391 output(o
, 3, "Removing %s to make room for subdirectory; may re-add later.", last_file
);
396 * Determine whether path could exist as a file in the
397 * working directory as a possible D/F conflict. This
398 * will only occur when it exists in stage 2 as a
401 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
413 struct diff_filepair
*pair
;
414 struct stage_data
*src_entry
;
415 struct stage_data
*dst_entry
;
416 unsigned processed
:1;
420 * Get information of all renames which occurred between 'o_tree' and
421 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
422 * 'b_tree') to be able to associate the correct cache entries with
423 * the rename information. 'tree' is always equal to either a_tree or b_tree.
425 static struct string_list
*get_renames(struct merge_options
*o
,
430 struct string_list
*entries
)
433 struct string_list
*renames
;
434 struct diff_options opts
;
436 renames
= xcalloc(1, sizeof(struct string_list
));
438 DIFF_OPT_SET(&opts
, RECURSIVE
);
439 opts
.detect_rename
= DIFF_DETECT_RENAME
;
440 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
441 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
443 opts
.rename_score
= o
->rename_score
;
444 opts
.show_rename_progress
= o
->show_rename_progress
;
445 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
446 if (diff_setup_done(&opts
) < 0)
447 die("diff setup failed");
448 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
450 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
451 o
->needed_rename_limit
= opts
.needed_rename_limit
;
452 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
453 struct string_list_item
*item
;
455 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
456 if (pair
->status
!= 'R') {
457 diff_free_filepair(pair
);
460 re
= xmalloc(sizeof(*re
));
463 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
465 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
466 o_tree
, a_tree
, b_tree
, entries
);
468 re
->src_entry
= item
->util
;
470 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
472 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
473 o_tree
, a_tree
, b_tree
, entries
);
475 re
->dst_entry
= item
->util
;
476 item
= string_list_insert(renames
, pair
->one
->path
);
479 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
480 diff_queued_diff
.nr
= 0;
485 static int update_stages_options(const char *path
, struct diff_filespec
*o
,
486 struct diff_filespec
*a
, struct diff_filespec
*b
,
487 int clear
, int options
)
490 if (remove_file_from_cache(path
))
493 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
496 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
499 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
504 static int update_stages(const char *path
, struct diff_filespec
*o
,
505 struct diff_filespec
*a
, struct diff_filespec
*b
,
508 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
509 return update_stages_options(path
, o
, a
, b
, clear
, options
);
512 static int update_stages_and_entry(const char *path
,
513 struct stage_data
*entry
,
514 struct diff_filespec
*o
,
515 struct diff_filespec
*a
,
516 struct diff_filespec
*b
,
521 entry
->processed
= 0;
522 entry
->stages
[1].mode
= o
->mode
;
523 entry
->stages
[2].mode
= a
->mode
;
524 entry
->stages
[3].mode
= b
->mode
;
525 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
526 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
527 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
528 options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
529 return update_stages_options(path
, o
, a
, b
, clear
, options
);
532 static int remove_file(struct merge_options
*o
, int clean
,
533 const char *path
, int no_wd
)
535 int update_cache
= o
->call_depth
|| clean
;
536 int update_working_directory
= !o
->call_depth
&& !no_wd
;
539 if (remove_file_from_cache(path
))
542 if (update_working_directory
) {
543 if (remove_path(path
))
549 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
551 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
554 char *p
= newpath
+ strlen(path
);
555 strcpy(newpath
, path
);
561 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
562 string_list_has_string(&o
->current_directory_set
, newpath
) ||
563 lstat(newpath
, &st
) == 0)
564 sprintf(p
, "_%d", suffix
++);
566 string_list_insert(&o
->current_file_set
, newpath
);
570 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
573 long ret
= write_in_full(fd
, buf
, size
);
578 die_errno("merge-recursive");
580 die("merge-recursive: disk full?");
587 static int would_lose_untracked(const char *path
)
589 int pos
= cache_name_pos(path
, strlen(path
));
593 while (pos
< active_nr
&&
594 !strcmp(path
, active_cache
[pos
]->name
)) {
596 * If stage #0, it is definitely tracked.
597 * If it has stage #2 then it was tracked
598 * before this merge started. All other
599 * cases the path was not tracked.
601 switch (ce_stage(active_cache
[pos
])) {
608 return file_exists(path
);
611 static int make_room_for_path(const char *path
)
614 const char *msg
= "failed to create path '%s'%s";
616 status
= safe_create_leading_directories_const(path
);
619 /* something else exists */
620 error(msg
, path
, ": perhaps a D/F conflict?");
627 * Do not unlink a file in the work tree if we are not
630 if (would_lose_untracked(path
))
631 return error("refusing to lose untracked file at '%s'",
634 /* Successful unlink is good.. */
637 /* .. and so is no existing file */
640 /* .. but not some other error (who really cares what?) */
641 return error(msg
, path
, ": perhaps a D/F conflict?");
644 static void update_file_flags(struct merge_options
*o
,
645 const unsigned char *sha
,
655 enum object_type type
;
659 if (S_ISGITLINK(mode
)) {
661 * We may later decide to recursively descend into
662 * the submodule directory and update its index
663 * and/or work tree, but we do not do that now.
669 buf
= read_sha1_file(sha
, &type
, &size
);
671 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
672 if (type
!= OBJ_BLOB
)
673 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
675 struct strbuf strbuf
= STRBUF_INIT
;
676 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
679 buf
= strbuf_detach(&strbuf
, NULL
);
683 if (make_room_for_path(path
) < 0) {
688 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
694 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
696 die_errno("failed to open '%s'", path
);
697 flush_buffer(fd
, buf
, size
);
699 } else if (S_ISLNK(mode
)) {
700 char *lnk
= xmemdupz(buf
, size
);
701 safe_create_leading_directories_const(path
);
703 if (symlink(lnk
, path
))
704 die_errno("failed to symlink '%s'", path
);
707 die("do not know what to do with %06o %s '%s'",
708 mode
, sha1_to_hex(sha
), path
);
713 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
716 static void update_file(struct merge_options
*o
,
718 const unsigned char *sha
,
722 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
725 /* Low level file merging, update and removal */
727 struct merge_file_info
729 unsigned char sha
[20];
735 static int merge_3way(struct merge_options
*o
,
736 mmbuffer_t
*result_buf
,
737 struct diff_filespec
*one
,
738 struct diff_filespec
*a
,
739 struct diff_filespec
*b
,
743 mmfile_t orig
, src1
, src2
;
744 struct ll_merge_options ll_opts
= {0};
745 char *base_name
, *name1
, *name2
;
748 ll_opts
.renormalize
= o
->renormalize
;
749 ll_opts
.xdl_opts
= o
->xdl_opts
;
752 ll_opts
.virtual_ancestor
= 1;
755 switch (o
->recursive_variant
) {
756 case MERGE_RECURSIVE_OURS
:
757 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
759 case MERGE_RECURSIVE_THEIRS
:
760 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
768 if (strcmp(a
->path
, b
->path
) ||
769 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
770 base_name
= o
->ancestor
== NULL
? NULL
:
771 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
772 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
773 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
775 base_name
= o
->ancestor
== NULL
? NULL
:
776 xstrdup(mkpath("%s", o
->ancestor
));
777 name1
= xstrdup(mkpath("%s", branch1
));
778 name2
= xstrdup(mkpath("%s", branch2
));
781 read_mmblob(&orig
, one
->sha1
);
782 read_mmblob(&src1
, a
->sha1
);
783 read_mmblob(&src2
, b
->sha1
);
785 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
786 &src1
, name1
, &src2
, name2
, &ll_opts
);
796 static struct merge_file_info
merge_file(struct merge_options
*o
,
797 struct diff_filespec
*one
,
798 struct diff_filespec
*a
,
799 struct diff_filespec
*b
,
803 struct merge_file_info result
;
807 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
809 if (S_ISREG(a
->mode
)) {
810 result
.mode
= a
->mode
;
811 hashcpy(result
.sha
, a
->sha1
);
813 result
.mode
= b
->mode
;
814 hashcpy(result
.sha
, b
->sha1
);
817 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
823 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
824 result
.mode
= b
->mode
;
826 result
.mode
= a
->mode
;
827 if (b
->mode
!= one
->mode
) {
833 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
834 hashcpy(result
.sha
, b
->sha1
);
835 else if (sha_eq(b
->sha1
, one
->sha1
))
836 hashcpy(result
.sha
, a
->sha1
);
837 else if (S_ISREG(a
->mode
)) {
838 mmbuffer_t result_buf
;
841 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
844 if ((merge_status
< 0) || !result_buf
.ptr
)
845 die("Failed to execute internal merge");
847 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
848 blob_type
, result
.sha
))
849 die("Unable to add %s to database",
852 free(result_buf
.ptr
);
853 result
.clean
= (merge_status
== 0);
854 } else if (S_ISGITLINK(a
->mode
)) {
855 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
857 } else if (S_ISLNK(a
->mode
)) {
858 hashcpy(result
.sha
, a
->sha1
);
860 if (!sha_eq(a
->sha1
, b
->sha1
))
863 die("unsupported object type in the tree");
870 static void conflict_rename_delete(struct merge_options
*o
,
871 struct diff_filepair
*pair
,
872 const char *rename_branch
,
873 const char *other_branch
)
875 char *dest_name
= pair
->two
->path
;
879 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
881 pair
->one
->path
, pair
->two
->path
, rename_branch
,
884 update_stages(dest_name
, NULL
,
885 rename_branch
== o
->branch1
? pair
->two
: NULL
,
886 rename_branch
== o
->branch1
? NULL
: pair
->two
,
888 if (lstat(dest_name
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
889 dest_name
= unique_path(o
, dest_name
, rename_branch
);
892 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
897 static void conflict_rename_rename_1to2(struct merge_options
*o
,
898 struct diff_filepair
*pair1
,
900 struct diff_filepair
*pair2
,
903 /* One file was renamed in both branches, but to different names. */
906 const char *ren1_dst
= pair1
->two
->path
;
907 const char *ren2_dst
= pair2
->two
->path
;
908 const char *dst_name1
= ren1_dst
;
909 const char *dst_name2
= ren2_dst
;
911 if (lstat(ren1_dst
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
912 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
913 output(o
, 1, "%s is a directory in %s adding as %s instead",
914 ren1_dst
, branch2
, dst_name1
);
916 if (lstat(ren2_dst
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
917 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
918 output(o
, 1, "%s is a directory in %s adding as %s instead",
919 ren2_dst
, branch1
, dst_name2
);
922 remove_file_from_cache(dst_name1
);
923 remove_file_from_cache(dst_name2
);
925 * Uncomment to leave the conflicting names in the resulting tree
927 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
928 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
931 update_stages(ren1_dst
, NULL
, pair1
->two
, NULL
, 1);
932 update_stages(ren2_dst
, NULL
, NULL
, pair2
->two
, 1);
934 update_file(o
, 0, pair1
->two
->sha1
, pair1
->two
->mode
, dst_name1
);
935 update_file(o
, 0, pair2
->two
->sha1
, pair2
->two
->mode
, dst_name2
);
941 static void conflict_rename_rename_2to1(struct merge_options
*o
,
947 /* Two files were renamed to the same thing. */
948 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
949 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
950 output(o
, 1, "Renaming %s to %s and %s to %s instead",
951 ren1
->pair
->one
->path
, new_path1
,
952 ren2
->pair
->one
->path
, new_path2
);
953 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
954 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
955 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
960 static int process_renames(struct merge_options
*o
,
961 struct string_list
*a_renames
,
962 struct string_list
*b_renames
)
964 int clean_merge
= 1, i
, j
;
965 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
966 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
967 const struct rename
*sre
;
969 for (i
= 0; i
< a_renames
->nr
; i
++) {
970 sre
= a_renames
->items
[i
].util
;
971 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
974 for (i
= 0; i
< b_renames
->nr
; i
++) {
975 sre
= b_renames
->items
[i
].util
;
976 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
980 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
982 struct string_list
*renames1
, *renames2Dst
;
983 struct rename
*ren1
= NULL
, *ren2
= NULL
;
984 const char *branch1
, *branch2
;
985 const char *ren1_src
, *ren1_dst
;
987 if (i
>= a_renames
->nr
) {
988 ren2
= b_renames
->items
[j
++].util
;
989 } else if (j
>= b_renames
->nr
) {
990 ren1
= a_renames
->items
[i
++].util
;
992 int compare
= strcmp(a_renames
->items
[i
].string
,
993 b_renames
->items
[j
].string
);
995 ren1
= a_renames
->items
[i
++].util
;
997 ren2
= b_renames
->items
[j
++].util
;
1000 /* TODO: refactor, so that 1/2 are not needed */
1002 renames1
= a_renames
;
1003 renames2Dst
= &b_by_dst
;
1004 branch1
= o
->branch1
;
1005 branch2
= o
->branch2
;
1008 renames1
= b_renames
;
1009 renames2Dst
= &a_by_dst
;
1010 branch1
= o
->branch2
;
1011 branch2
= o
->branch1
;
1016 src
= ren1
->pair
->one
->path
;
1018 ren1
->dst_entry
->processed
= 1;
1019 ren1
->src_entry
->processed
= 1;
1021 if (ren1
->processed
)
1023 ren1
->processed
= 1;
1025 ren1_src
= ren1
->pair
->one
->path
;
1026 ren1_dst
= ren1
->pair
->two
->path
;
1029 const char *ren2_src
= ren2
->pair
->one
->path
;
1030 const char *ren2_dst
= ren2
->pair
->two
->path
;
1031 /* Renamed in 1 and renamed in 2 */
1032 if (strcmp(ren1_src
, ren2_src
) != 0)
1033 die("ren1.src != ren2.src");
1034 ren2
->dst_entry
->processed
= 1;
1035 ren2
->processed
= 1;
1036 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1037 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO
,
1045 remove_file(o
, 1, ren1_src
, 1);
1046 update_stages_and_entry(ren1_dst
,
1054 /* Renamed in 1, maybe changed in 2 */
1055 struct string_list_item
*item
;
1056 /* we only use sha1 and mode of these */
1057 struct diff_filespec src_other
, dst_other
;
1061 * unpack_trees loads entries from common-commit
1062 * into stage 1, from head-commit into stage 2, and
1063 * from merge-commit into stage 3. We keep track
1064 * of which side corresponds to the rename.
1066 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1067 int other_stage
= a_renames
== renames1
? 3 : 2;
1069 remove_file(o
, 1, ren1_src
, o
->call_depth
|| renamed_stage
== 2);
1071 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1072 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1073 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1074 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1077 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1078 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1079 ren1
->dst_entry
->processed
= 0;
1080 setup_rename_df_conflict_info(RENAME_DELETE
,
1089 conflict_rename_delete(o
, ren1
->pair
, branch1
, branch2
);
1091 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1092 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1093 /* Added file on the other side
1094 identical to the file being
1095 renamed: clean merge */
1096 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1097 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1098 const char *new_path
;
1101 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1103 ren1_src
, ren1_dst
, branch1
,
1105 if (o
->call_depth
) {
1106 struct merge_file_info mfi
;
1107 struct diff_filespec one
, a
, b
;
1109 one
.path
= a
.path
= b
.path
=
1111 hashcpy(one
.sha1
, null_sha1
);
1113 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
1114 a
.mode
= ren1
->pair
->two
->mode
;
1115 hashcpy(b
.sha1
, dst_other
.sha1
);
1116 b
.mode
= dst_other
.mode
;
1117 mfi
= merge_file(o
, &one
, &a
, &b
,
1120 output(o
, 1, "Adding merged %s", ren1_dst
);
1127 new_path
= unique_path(o
, ren1_dst
, branch2
);
1128 output(o
, 1, "Adding as %s instead", new_path
);
1129 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1131 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1134 ren2
->processed
= 1;
1135 output(o
, 1, "CONFLICT (rename/rename): "
1136 "Rename %s->%s in %s. "
1137 "Rename %s->%s in %s",
1138 ren1_src
, ren1_dst
, branch1
,
1139 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1140 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1145 struct diff_filespec
*one
, *a
, *b
;
1146 src_other
.path
= (char *)ren1_src
;
1148 one
= ren1
->pair
->one
;
1149 if (a_renames
== renames1
) {
1150 a
= ren1
->pair
->two
;
1153 b
= ren1
->pair
->two
;
1156 update_stages_and_entry(ren1_dst
, ren1
->dst_entry
, one
, a
, b
, 1);
1157 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1158 setup_rename_df_conflict_info(RENAME_NORMAL
,
1169 string_list_clear(&a_by_dst
, 0);
1170 string_list_clear(&b_by_dst
, 0);
1175 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1177 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1180 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1183 enum object_type type
;
1185 buf
= read_sha1_file(sha1
, &type
, &size
);
1187 return error("cannot read object %s", sha1_to_hex(sha1
));
1188 if (type
!= OBJ_BLOB
) {
1190 return error("object %s is not a blob", sha1_to_hex(sha1
));
1192 strbuf_attach(dst
, buf
, size
, size
+ 1);
1196 static int blob_unchanged(const unsigned char *o_sha
,
1197 const unsigned char *a_sha
,
1198 int renormalize
, const char *path
)
1200 struct strbuf o
= STRBUF_INIT
;
1201 struct strbuf a
= STRBUF_INIT
;
1202 int ret
= 0; /* assume changed for safety */
1204 if (sha_eq(o_sha
, a_sha
))
1209 assert(o_sha
&& a_sha
);
1210 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1213 * Note: binary | is used so that both renormalizations are
1214 * performed. Comparison can be skipped if both files are
1215 * unchanged since their sha1s have already been compared.
1217 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1218 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1219 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1227 static void handle_delete_modify(struct merge_options
*o
,
1229 const char *new_path
,
1230 unsigned char *a_sha
, int a_mode
,
1231 unsigned char *b_sha
, int b_mode
)
1234 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1235 "and modified in %s. Version %s of %s left in tree%s%s.",
1237 o
->branch2
, o
->branch2
, path
,
1238 path
== new_path
? "" : " at ",
1239 path
== new_path
? "" : new_path
);
1240 update_file(o
, 0, b_sha
, b_mode
, new_path
);
1242 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1243 "and modified in %s. Version %s of %s left in tree%s%s.",
1245 o
->branch1
, o
->branch1
, path
,
1246 path
== new_path
? "" : " at ",
1247 path
== new_path
? "" : new_path
);
1248 update_file(o
, 0, a_sha
, a_mode
, new_path
);
1252 static int merge_content(struct merge_options
*o
,
1254 unsigned char *o_sha
, int o_mode
,
1255 unsigned char *a_sha
, int a_mode
,
1256 unsigned char *b_sha
, int b_mode
,
1257 const char *df_rename_conflict_branch
)
1259 const char *reason
= "content";
1260 struct merge_file_info mfi
;
1261 struct diff_filespec one
, a
, b
;
1263 unsigned df_conflict_remains
= 0;
1267 o_sha
= (unsigned char *)null_sha1
;
1269 one
.path
= a
.path
= b
.path
= (char *)path
;
1270 hashcpy(one
.sha1
, o_sha
);
1272 hashcpy(a
.sha1
, a_sha
);
1274 hashcpy(b
.sha1
, b_sha
);
1277 mfi
= merge_file(o
, &one
, &a
, &b
, o
->branch1
, o
->branch2
);
1278 if (df_rename_conflict_branch
&&
1279 lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1280 df_conflict_remains
= 1;
1283 if (mfi
.clean
&& !df_conflict_remains
&&
1284 sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a
.mode
)
1285 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1287 output(o
, 2, "Auto-merging %s", path
);
1290 if (S_ISGITLINK(mfi
.mode
))
1291 reason
= "submodule";
1292 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1296 if (df_conflict_remains
) {
1297 const char *new_path
;
1298 update_file_flags(o
, mfi
.sha
, mfi
.mode
, path
,
1299 o
->call_depth
|| mfi
.clean
, 0);
1300 new_path
= unique_path(o
, path
, df_rename_conflict_branch
);
1302 output(o
, 1, "Adding as %s instead", new_path
);
1303 update_file_flags(o
, mfi
.sha
, mfi
.mode
, new_path
, 0, 1);
1305 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1311 /* Per entry merge function */
1312 static int process_entry(struct merge_options
*o
,
1313 const char *path
, struct stage_data
*entry
)
1316 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1317 print_index_entry("\tpath: ", entry);
1319 int clean_merge
= 1;
1320 int normalize
= o
->renormalize
;
1321 unsigned o_mode
= entry
->stages
[1].mode
;
1322 unsigned a_mode
= entry
->stages
[2].mode
;
1323 unsigned b_mode
= entry
->stages
[3].mode
;
1324 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1325 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1326 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1328 if (entry
->rename_df_conflict_info
)
1329 return 1; /* Such cases are handled elsewhere. */
1331 entry
->processed
= 1;
1332 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1333 /* Case A: Deleted in one */
1334 if ((!a_sha
&& !b_sha
) ||
1335 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1336 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1337 /* Deleted in both or deleted in one and
1338 * unchanged in the other */
1340 output(o
, 2, "Removing %s", path
);
1341 /* do not touch working file if it did not exist */
1342 remove_file(o
, 1, path
, !a_sha
);
1343 } else if (string_list_has_string(&o
->current_directory_set
,
1345 entry
->processed
= 0;
1346 return 1; /* Assume clean until processed */
1348 /* Deleted in one and changed in the other */
1350 handle_delete_modify(o
, path
, path
,
1351 a_sha
, a_mode
, b_sha
, b_mode
);
1354 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1355 (!o_sha
&& !a_sha
&& b_sha
)) {
1356 /* Case B: Added in one. */
1358 const unsigned char *sha
;
1367 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1368 /* Handle D->F conflicts after all subfiles */
1369 entry
->processed
= 0;
1370 return 1; /* Assume clean until processed */
1372 output(o
, 2, "Adding %s", path
);
1373 update_file(o
, 1, sha
, mode
, path
);
1375 } else if (a_sha
&& b_sha
) {
1376 /* Case C: Added in both (check for same permissions) and */
1377 /* case D: Modified in both, but differently. */
1378 clean_merge
= merge_content(o
, path
,
1379 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1381 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1383 * this entry was deleted altogether. a_mode == 0 means
1384 * we had that path and want to actively remove it.
1386 remove_file(o
, 1, path
, !a_mode
);
1388 die("Fatal merge failure, shouldn't happen.");
1394 * Per entry merge function for D/F (and/or rename) conflicts. In the
1395 * cases we can cleanly resolve D/F conflicts, process_entry() can
1396 * clean out all the files below the directory for us. All D/F
1397 * conflict cases must be handled here at the end to make sure any
1398 * directories that can be cleaned out, are.
1400 * Some rename conflicts may also be handled here that don't necessarily
1401 * involve D/F conflicts, since the code to handle them is generic enough
1402 * to handle those rename conflicts with or without D/F conflicts also
1405 static int process_df_entry(struct merge_options
*o
,
1406 const char *path
, struct stage_data
*entry
)
1408 int clean_merge
= 1;
1409 unsigned o_mode
= entry
->stages
[1].mode
;
1410 unsigned a_mode
= entry
->stages
[2].mode
;
1411 unsigned b_mode
= entry
->stages
[3].mode
;
1412 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1413 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1414 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1417 entry
->processed
= 1;
1418 if (entry
->rename_df_conflict_info
) {
1419 struct rename_df_conflict_info
*conflict_info
= entry
->rename_df_conflict_info
;
1421 switch (conflict_info
->rename_type
) {
1423 clean_merge
= merge_content(o
, path
,
1424 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1425 conflict_info
->branch1
);
1429 conflict_rename_delete(o
, conflict_info
->pair1
,
1430 conflict_info
->branch1
,
1431 conflict_info
->branch2
);
1433 case RENAME_ONE_FILE_TO_TWO
:
1434 src
= conflict_info
->pair1
->one
->path
;
1436 output(o
, 1, "CONFLICT (rename/rename): "
1437 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1438 "rename \"%s\"->\"%s\" in \"%s\"%s",
1439 src
, conflict_info
->pair1
->two
->path
, conflict_info
->branch1
,
1440 src
, conflict_info
->pair2
->two
->path
, conflict_info
->branch2
,
1441 o
->call_depth
? " (left unresolved)" : "");
1442 if (o
->call_depth
) {
1443 remove_file_from_cache(src
);
1444 update_file(o
, 0, conflict_info
->pair1
->one
->sha1
,
1445 conflict_info
->pair1
->one
->mode
, src
);
1447 conflict_rename_rename_1to2(o
, conflict_info
->pair1
,
1448 conflict_info
->branch1
,
1449 conflict_info
->pair2
,
1450 conflict_info
->branch2
);
1451 conflict_info
->dst_entry2
->processed
= 1;
1454 entry
->processed
= 0;
1457 } else if (o_sha
&& (!a_sha
|| !b_sha
)) {
1458 /* Modify/delete; deleted side may have put a directory in the way */
1459 const char *new_path
= path
;
1460 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
))
1461 new_path
= unique_path(o
, path
, a_sha
? o
->branch1
: o
->branch2
);
1463 handle_delete_modify(o
, path
, new_path
,
1464 a_sha
, a_mode
, b_sha
, b_mode
);
1465 } else if (!o_sha
&& !!a_sha
!= !!b_sha
) {
1466 /* directory -> (directory, file) */
1467 const char *add_branch
;
1468 const char *other_branch
;
1470 const unsigned char *sha
;
1474 add_branch
= o
->branch1
;
1475 other_branch
= o
->branch2
;
1478 conf
= "file/directory";
1480 add_branch
= o
->branch2
;
1481 other_branch
= o
->branch1
;
1484 conf
= "directory/file";
1486 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1487 const char *new_path
= unique_path(o
, path
, add_branch
);
1489 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1491 conf
, path
, other_branch
, path
, new_path
);
1492 update_file(o
, 0, sha
, mode
, new_path
);
1494 output(o
, 2, "Adding %s", path
);
1495 update_file(o
, 1, sha
, mode
, path
);
1498 entry
->processed
= 0;
1499 return 1; /* not handled; assume clean until processed */
1505 int merge_trees(struct merge_options
*o
,
1508 struct tree
*common
,
1509 struct tree
**result
)
1513 if (o
->subtree_shift
) {
1514 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1515 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1518 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1519 output(o
, 0, "Already up-to-date!");
1524 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1527 if (show(o
, 4) || o
->call_depth
)
1528 die("merging of trees %s and %s failed",
1529 sha1_to_hex(head
->object
.sha1
),
1530 sha1_to_hex(merge
->object
.sha1
));
1535 if (unmerged_cache()) {
1536 struct string_list
*entries
, *re_head
, *re_merge
;
1538 string_list_clear(&o
->current_file_set
, 1);
1539 string_list_clear(&o
->current_directory_set
, 1);
1540 get_files_dirs(o
, head
);
1541 get_files_dirs(o
, merge
);
1543 entries
= get_unmerged();
1544 make_room_for_directories_of_df_conflicts(o
, entries
);
1545 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1546 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1547 clean
= process_renames(o
, re_head
, re_merge
);
1548 for (i
= 0; i
< entries
->nr
; i
++) {
1549 const char *path
= entries
->items
[i
].string
;
1550 struct stage_data
*e
= entries
->items
[i
].util
;
1552 && !process_entry(o
, path
, e
))
1555 for (i
= 0; i
< entries
->nr
; i
++) {
1556 const char *path
= entries
->items
[i
].string
;
1557 struct stage_data
*e
= entries
->items
[i
].util
;
1559 && !process_df_entry(o
, path
, e
))
1562 for (i
= 0; i
< entries
->nr
; i
++) {
1563 struct stage_data
*e
= entries
->items
[i
].util
;
1565 die("Unprocessed path??? %s",
1566 entries
->items
[i
].string
);
1569 string_list_clear(re_merge
, 0);
1570 string_list_clear(re_head
, 0);
1571 string_list_clear(entries
, 1);
1578 *result
= write_tree_from_memory(o
);
1583 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1585 struct commit_list
*next
= NULL
, *current
, *backup
;
1586 for (current
= list
; current
; current
= backup
) {
1587 backup
= current
->next
;
1588 current
->next
= next
;
1595 * Merge the commits h1 and h2, return the resulting virtual
1596 * commit object and a flag indicating the cleanness of the merge.
1598 int merge_recursive(struct merge_options
*o
,
1601 struct commit_list
*ca
,
1602 struct commit
**result
)
1604 struct commit_list
*iter
;
1605 struct commit
*merged_common_ancestors
;
1606 struct tree
*mrtree
= mrtree
;
1610 output(o
, 4, "Merging:");
1611 output_commit_title(o
, h1
);
1612 output_commit_title(o
, h2
);
1616 ca
= get_merge_bases(h1
, h2
, 1);
1617 ca
= reverse_commit_list(ca
);
1621 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1622 for (iter
= ca
; iter
; iter
= iter
->next
)
1623 output_commit_title(o
, iter
->item
);
1626 merged_common_ancestors
= pop_commit(&ca
);
1627 if (merged_common_ancestors
== NULL
) {
1628 /* if there is no common ancestor, make an empty tree */
1629 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1631 tree
->object
.parsed
= 1;
1632 tree
->object
.type
= OBJ_TREE
;
1633 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1634 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1637 for (iter
= ca
; iter
; iter
= iter
->next
) {
1638 const char *saved_b1
, *saved_b2
;
1641 * When the merge fails, the result contains files
1642 * with conflict markers. The cleanness flag is
1643 * ignored, it was never actually used, as result of
1644 * merge_trees has always overwritten it: the committed
1645 * "conflicts" were already resolved.
1648 saved_b1
= o
->branch1
;
1649 saved_b2
= o
->branch2
;
1650 o
->branch1
= "Temporary merge branch 1";
1651 o
->branch2
= "Temporary merge branch 2";
1652 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1653 NULL
, &merged_common_ancestors
);
1654 o
->branch1
= saved_b1
;
1655 o
->branch2
= saved_b2
;
1658 if (!merged_common_ancestors
)
1659 die("merge returned no commit");
1666 o
->ancestor
= "merged common ancestors";
1667 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1670 if (o
->call_depth
) {
1671 *result
= make_virtual_commit(mrtree
, "merged tree");
1672 commit_list_insert(h1
, &(*result
)->parents
);
1673 commit_list_insert(h2
, &(*result
)->parents
->next
);
1676 if (o
->needed_rename_limit
)
1677 warning(rename_limit_advice
, o
->needed_rename_limit
);
1681 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1683 struct object
*object
;
1685 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1688 if (object
->type
== OBJ_TREE
)
1689 return make_virtual_commit((struct tree
*)object
, name
);
1690 if (object
->type
!= OBJ_COMMIT
)
1692 if (parse_commit((struct commit
*)object
))
1694 return (struct commit
*)object
;
1697 int merge_recursive_generic(struct merge_options
*o
,
1698 const unsigned char *head
,
1699 const unsigned char *merge
,
1701 const unsigned char **base_list
,
1702 struct commit
**result
)
1704 int clean
, index_fd
;
1705 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1706 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1707 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1708 struct commit_list
*ca
= NULL
;
1712 for (i
= 0; i
< num_base_list
; ++i
) {
1713 struct commit
*base
;
1714 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1715 return error("Could not parse object '%s'",
1716 sha1_to_hex(base_list
[i
]));
1717 commit_list_insert(base
, &ca
);
1721 index_fd
= hold_locked_index(lock
, 1);
1722 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1724 if (active_cache_changed
&&
1725 (write_cache(index_fd
, active_cache
, active_nr
) ||
1726 commit_locked_index(lock
)))
1727 return error("Unable to write index.");
1729 return clean
? 0 : 1;
1732 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1734 struct merge_options
*o
= cb
;
1735 if (!strcasecmp(var
, "merge.verbosity")) {
1736 o
->verbosity
= git_config_int(var
, value
);
1739 if (!strcasecmp(var
, "diff.renamelimit")) {
1740 o
->diff_rename_limit
= git_config_int(var
, value
);
1743 if (!strcasecmp(var
, "merge.renamelimit")) {
1744 o
->merge_rename_limit
= git_config_int(var
, value
);
1747 return git_xmerge_config(var
, value
, cb
);
1750 void init_merge_options(struct merge_options
*o
)
1752 memset(o
, 0, sizeof(struct merge_options
));
1754 o
->buffer_output
= 1;
1755 o
->diff_rename_limit
= -1;
1756 o
->merge_rename_limit
= -1;
1758 git_config(merge_recursive_config
, o
);
1759 if (getenv("GIT_MERGE_VERBOSITY"))
1761 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1762 if (o
->verbosity
>= 5)
1763 o
->buffer_output
= 0;
1764 strbuf_init(&o
->obuf
, 0);
1765 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1766 o
->current_file_set
.strdup_strings
= 1;
1767 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1768 o
->current_directory_set
.strdup_strings
= 1;
1771 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1775 if (!strcmp(s
, "ours"))
1776 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1777 else if (!strcmp(s
, "theirs"))
1778 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1779 else if (!strcmp(s
, "subtree"))
1780 o
->subtree_shift
= "";
1781 else if (!prefixcmp(s
, "subtree="))
1782 o
->subtree_shift
= s
+ strlen("subtree=");
1783 else if (!strcmp(s
, "patience"))
1784 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1785 else if (!strcmp(s
, "ignore-space-change"))
1786 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1787 else if (!strcmp(s
, "ignore-all-space"))
1788 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1789 else if (!strcmp(s
, "ignore-space-at-eol"))
1790 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1791 else if (!strcmp(s
, "renormalize"))
1793 else if (!strcmp(s
, "no-renormalize"))
1795 else if (!prefixcmp(s
, "rename-threshold=")) {
1796 const char *score
= s
+ strlen("rename-threshold=");
1797 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)