2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
8 #include "cache-tree.h"
12 #include "tree-walk.h"
16 #include "unpack-trees.h"
17 #include "string-list.h"
18 #include "xdiff-interface.h"
21 #include "merge-recursive.h"
23 #include "submodule.h"
25 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
26 const char *subtree_shift
)
28 unsigned char shifted
[20];
30 if (!*subtree_shift
) {
31 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 0);
33 shift_tree_by(one
->object
.sha1
, two
->object
.sha1
, shifted
,
36 if (!hashcmp(two
->object
.sha1
, shifted
))
38 return lookup_tree(shifted
);
42 * A virtual commit has (const char *)commit->util set to the name.
45 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
47 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
49 commit
->util
= (void*)comment
;
51 commit
->object
.parsed
= 1;
56 * Since we use get_tree_entry(), which does not put the read object into
57 * the object pool, we cannot rely on a == b.
59 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
63 return a
&& b
&& hashcmp(a
, b
) == 0;
69 RENAME_ONE_FILE_TO_TWO
72 struct rename_df_conflict_info
{
73 enum rename_type rename_type
;
74 struct diff_filepair
*pair1
;
75 struct diff_filepair
*pair2
;
78 struct stage_data
*dst_entry1
;
79 struct stage_data
*dst_entry2
;
83 * Since we want to write the index eventually, we cannot reuse the index
84 * for these (temporary) data.
89 unsigned char sha
[20];
91 struct rename_df_conflict_info
*rename_df_conflict_info
;
95 static inline void setup_rename_df_conflict_info(enum rename_type rename_type
,
96 struct diff_filepair
*pair1
,
97 struct diff_filepair
*pair2
,
100 struct stage_data
*dst_entry1
,
101 struct stage_data
*dst_entry2
)
103 struct rename_df_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_df_conflict_info
));
104 ci
->rename_type
= rename_type
;
106 ci
->branch1
= branch1
;
107 ci
->branch2
= branch2
;
109 ci
->dst_entry1
= dst_entry1
;
110 dst_entry1
->rename_df_conflict_info
= ci
;
111 dst_entry1
->processed
= 0;
113 assert(!pair2
== !dst_entry2
);
115 ci
->dst_entry2
= dst_entry2
;
117 dst_entry2
->rename_df_conflict_info
= ci
;
118 dst_entry2
->processed
= 0;
122 static int show(struct merge_options
*o
, int v
)
124 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
127 static void flush_output(struct merge_options
*o
)
130 fputs(o
->obuf
.buf
, stdout
);
131 strbuf_reset(&o
->obuf
);
135 __attribute__((format (printf
, 3, 4)))
136 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
143 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
144 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
145 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
148 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
151 strbuf_add(&o
->obuf
, "\n", 1);
152 if (!o
->buffer_output
)
156 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
160 for (i
= o
->call_depth
; i
--;)
163 printf("virtual %s\n", (char *)commit
->util
);
165 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
166 if (parse_commit(commit
) != 0)
167 printf("(bad commit)\n");
170 int len
= find_commit_subject(commit
->buffer
, &title
);
172 printf("%.*s\n", len
, title
);
177 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
178 const char *path
, int stage
, int refresh
, int options
)
180 struct cache_entry
*ce
;
181 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
183 return error("addinfo_cache failed for path '%s'", path
);
184 return add_cache_entry(ce
, options
);
187 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
190 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
193 static int git_merge_trees(int index_only
,
199 struct tree_desc t
[3];
200 struct unpack_trees_options opts
;
202 memset(&opts
, 0, sizeof(opts
));
209 opts
.fn
= threeway_merge
;
210 opts
.src_index
= &the_index
;
211 opts
.dst_index
= &the_index
;
212 setup_unpack_trees_porcelain(&opts
, "merge");
214 init_tree_desc_from_tree(t
+0, common
);
215 init_tree_desc_from_tree(t
+1, head
);
216 init_tree_desc_from_tree(t
+2, merge
);
218 rc
= unpack_trees(3, t
, &opts
);
219 cache_tree_free(&active_cache_tree
);
223 struct tree
*write_tree_from_memory(struct merge_options
*o
)
225 struct tree
*result
= NULL
;
227 if (unmerged_cache()) {
229 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
230 for (i
= 0; i
< active_nr
; i
++) {
231 struct cache_entry
*ce
= active_cache
[i
];
233 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
234 (int)ce_namelen(ce
), ce
->name
);
236 die("Bug in merge-recursive.c");
239 if (!active_cache_tree
)
240 active_cache_tree
= cache_tree();
242 if (!cache_tree_fully_valid(active_cache_tree
) &&
243 cache_tree_update(active_cache_tree
,
244 active_cache
, active_nr
, 0, 0) < 0)
245 die("error building trees");
247 result
= lookup_tree(active_cache_tree
->sha1
);
252 static int save_files_dirs(const unsigned char *sha1
,
253 const char *base
, int baselen
, const char *path
,
254 unsigned int mode
, int stage
, void *context
)
256 int len
= strlen(path
);
257 char *newpath
= xmalloc(baselen
+ len
+ 1);
258 struct merge_options
*o
= context
;
260 memcpy(newpath
, base
, baselen
);
261 memcpy(newpath
+ baselen
, path
, len
);
262 newpath
[baselen
+ len
] = '\0';
265 string_list_insert(&o
->current_directory_set
, newpath
);
267 string_list_insert(&o
->current_file_set
, newpath
);
270 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
273 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
276 struct pathspec match_all
;
277 init_pathspec(&match_all
, NULL
);
278 if (read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
))
280 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
285 * Returns an index_entry instance which doesn't have to correspond to
286 * a real cache entry in Git's index.
288 static struct stage_data
*insert_stage_data(const char *path
,
289 struct tree
*o
, struct tree
*a
, struct tree
*b
,
290 struct string_list
*entries
)
292 struct string_list_item
*item
;
293 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
294 get_tree_entry(o
->object
.sha1
, path
,
295 e
->stages
[1].sha
, &e
->stages
[1].mode
);
296 get_tree_entry(a
->object
.sha1
, path
,
297 e
->stages
[2].sha
, &e
->stages
[2].mode
);
298 get_tree_entry(b
->object
.sha1
, path
,
299 e
->stages
[3].sha
, &e
->stages
[3].mode
);
300 item
= string_list_insert(entries
, path
);
306 * Create a dictionary mapping file names to stage_data objects. The
307 * dictionary contains one entry for every path with a non-zero stage entry.
309 static struct string_list
*get_unmerged(void)
311 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
314 unmerged
->strdup_strings
= 1;
316 for (i
= 0; i
< active_nr
; i
++) {
317 struct string_list_item
*item
;
318 struct stage_data
*e
;
319 struct cache_entry
*ce
= active_cache
[i
];
323 item
= string_list_lookup(unmerged
, ce
->name
);
325 item
= string_list_insert(unmerged
, ce
->name
);
326 item
->util
= xcalloc(1, sizeof(struct stage_data
));
329 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
330 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
336 static void make_room_for_directories_of_df_conflicts(struct merge_options
*o
,
337 struct string_list
*entries
)
339 /* If there are D/F conflicts, and the paths currently exist
340 * in the working copy as a file, we want to remove them to
341 * make room for the corresponding directory. Such paths will
342 * later be processed in process_df_entry() at the end. If
343 * the corresponding directory ends up being removed by the
344 * merge, then the file will be reinstated at that time
345 * (albeit with a different timestamp!); otherwise, if the
346 * file is not supposed to be removed by the merge, the
347 * contents of the file will be placed in another unique
350 * NOTE: This function relies on the fact that entries for a
351 * D/F conflict will appear adjacent in the index, with the
352 * entries for the file appearing before entries for paths
353 * below the corresponding directory.
355 const char *last_file
= NULL
;
357 struct stage_data
*last_e
;
361 * Do not do any of this crazyness during the recursive; we don't
362 * even write anything to the working tree!
367 for (i
= 0; i
< entries
->nr
; i
++) {
368 const char *path
= entries
->items
[i
].string
;
369 int len
= strlen(path
);
370 struct stage_data
*e
= entries
->items
[i
].util
;
373 * Check if last_file & path correspond to a D/F conflict;
374 * i.e. whether path is last_file+'/'+<something>.
375 * If so, remove last_file to make room for path and friends.
379 memcmp(path
, last_file
, last_len
) == 0 &&
380 path
[last_len
] == '/') {
381 output(o
, 3, "Removing %s to make room for subdirectory; may re-add later.", last_file
);
386 * Determine whether path could exist as a file in the
387 * working directory as a possible D/F conflict. This
388 * will only occur when it exists in stage 2 as a
391 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
402 struct diff_filepair
*pair
;
403 struct stage_data
*src_entry
;
404 struct stage_data
*dst_entry
;
405 unsigned processed
:1;
409 * Get information of all renames which occurred between 'o_tree' and
410 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
411 * 'b_tree') to be able to associate the correct cache entries with
412 * the rename information. 'tree' is always equal to either a_tree or b_tree.
414 static struct string_list
*get_renames(struct merge_options
*o
,
419 struct string_list
*entries
)
422 struct string_list
*renames
;
423 struct diff_options opts
;
425 renames
= xcalloc(1, sizeof(struct string_list
));
427 DIFF_OPT_SET(&opts
, RECURSIVE
);
428 opts
.detect_rename
= DIFF_DETECT_RENAME
;
429 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
430 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
432 opts
.rename_score
= o
->rename_score
;
433 opts
.show_rename_progress
= o
->show_rename_progress
;
434 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
436 if (diff_setup_done(&opts
) < 0)
437 die("diff setup failed");
438 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
440 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
441 o
->needed_rename_limit
= opts
.needed_rename_limit
;
442 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
443 struct string_list_item
*item
;
445 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
446 if (pair
->status
!= 'R') {
447 diff_free_filepair(pair
);
450 re
= xmalloc(sizeof(*re
));
453 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
455 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
456 o_tree
, a_tree
, b_tree
, entries
);
458 re
->src_entry
= item
->util
;
460 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
462 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
463 o_tree
, a_tree
, b_tree
, entries
);
465 re
->dst_entry
= item
->util
;
466 item
= string_list_insert(renames
, pair
->one
->path
);
469 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
470 diff_queued_diff
.nr
= 0;
475 static int update_stages_options(const char *path
, struct diff_filespec
*o
,
476 struct diff_filespec
*a
, struct diff_filespec
*b
,
477 int clear
, int options
)
480 if (remove_file_from_cache(path
))
483 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
486 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
489 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
494 static int update_stages(const char *path
, struct diff_filespec
*o
,
495 struct diff_filespec
*a
, struct diff_filespec
*b
,
498 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
499 return update_stages_options(path
, o
, a
, b
, clear
, options
);
502 static int update_stages_and_entry(const char *path
,
503 struct stage_data
*entry
,
504 struct diff_filespec
*o
,
505 struct diff_filespec
*a
,
506 struct diff_filespec
*b
,
511 entry
->processed
= 0;
512 entry
->stages
[1].mode
= o
->mode
;
513 entry
->stages
[2].mode
= a
->mode
;
514 entry
->stages
[3].mode
= b
->mode
;
515 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
516 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
517 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
518 options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
519 return update_stages_options(path
, o
, a
, b
, clear
, options
);
522 static int remove_file(struct merge_options
*o
, int clean
,
523 const char *path
, int no_wd
)
525 int update_cache
= o
->call_depth
|| clean
;
526 int update_working_directory
= !o
->call_depth
&& !no_wd
;
529 if (remove_file_from_cache(path
))
532 if (update_working_directory
) {
533 if (remove_path(path
))
539 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
541 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
544 char *p
= newpath
+ strlen(path
);
545 strcpy(newpath
, path
);
551 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
552 string_list_has_string(&o
->current_directory_set
, newpath
) ||
553 lstat(newpath
, &st
) == 0)
554 sprintf(p
, "_%d", suffix
++);
556 string_list_insert(&o
->current_file_set
, newpath
);
560 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
563 long ret
= write_in_full(fd
, buf
, size
);
568 die_errno("merge-recursive");
570 die("merge-recursive: disk full?");
577 static int would_lose_untracked(const char *path
)
579 int pos
= cache_name_pos(path
, strlen(path
));
583 while (pos
< active_nr
&&
584 !strcmp(path
, active_cache
[pos
]->name
)) {
586 * If stage #0, it is definitely tracked.
587 * If it has stage #2 then it was tracked
588 * before this merge started. All other
589 * cases the path was not tracked.
591 switch (ce_stage(active_cache
[pos
])) {
598 return file_exists(path
);
601 static int make_room_for_path(const char *path
)
604 const char *msg
= "failed to create path '%s'%s";
606 status
= safe_create_leading_directories_const(path
);
609 /* something else exists */
610 error(msg
, path
, ": perhaps a D/F conflict?");
617 * Do not unlink a file in the work tree if we are not
620 if (would_lose_untracked(path
))
621 return error("refusing to lose untracked file at '%s'",
624 /* Successful unlink is good.. */
627 /* .. and so is no existing file */
630 /* .. but not some other error (who really cares what?) */
631 return error(msg
, path
, ": perhaps a D/F conflict?");
634 static void update_file_flags(struct merge_options
*o
,
635 const unsigned char *sha
,
645 enum object_type type
;
649 if (S_ISGITLINK(mode
)) {
651 * We may later decide to recursively descend into
652 * the submodule directory and update its index
653 * and/or work tree, but we do not do that now.
659 buf
= read_sha1_file(sha
, &type
, &size
);
661 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
662 if (type
!= OBJ_BLOB
)
663 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
665 struct strbuf strbuf
= STRBUF_INIT
;
666 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
669 buf
= strbuf_detach(&strbuf
, NULL
);
673 if (make_room_for_path(path
) < 0) {
678 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
684 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
686 die_errno("failed to open '%s'", path
);
687 flush_buffer(fd
, buf
, size
);
689 } else if (S_ISLNK(mode
)) {
690 char *lnk
= xmemdupz(buf
, size
);
691 safe_create_leading_directories_const(path
);
693 if (symlink(lnk
, path
))
694 die_errno("failed to symlink '%s'", path
);
697 die("do not know what to do with %06o %s '%s'",
698 mode
, sha1_to_hex(sha
), path
);
703 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
706 static void update_file(struct merge_options
*o
,
708 const unsigned char *sha
,
712 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
715 static int update_or_remove(struct merge_options
*o
,
716 const unsigned char *sha1
, unsigned mode
,
717 const char *path
, int update_wd
)
719 if (is_null_sha1(sha1
))
720 return remove_file(o
, 1, path
, !update_wd
);
722 update_file_flags(o
, sha1
, mode
, path
, 1, update_wd
);
726 static void merge_rename_source(struct merge_options
*o
,
728 struct stage_data
*d
)
730 if (is_null_sha1(d
->stages
[2].sha
)) {
732 * If both were real renames (not from a broken pair), we can
733 * stop caring about the path. We don't touch the working
734 * directory, though. The path must be gone in HEAD, so there
735 * is no point (and anything we did delete would be an
738 if (is_null_sha1(d
->stages
[3].sha
)) {
739 remove_file(o
, 1, path
, 1);
744 * If "ours" was a real rename, but the other side came
745 * from a broken pair, then their version is the right
746 * resolution (because we have no content, ours having been
747 * renamed away, and they have new content).
749 update_file_flags(o
, d
->stages
[3].sha
, d
->stages
[3].mode
,
755 * Now we have the opposite. "theirs" is a real rename, but ours
756 * is from a broken pair. We resolve in favor of us, but we don't
757 * need to touch the working directory.
759 if (is_null_sha1(d
->stages
[3].sha
)) {
760 update_file_flags(o
, d
->stages
[2].sha
, d
->stages
[2].mode
,
766 * Otherwise, both came from broken pairs. We need to do an actual
767 * merge on the entries. We can just mark it as unprocessed and
768 * the regular code will handle it.
773 /* Low level file merging, update and removal */
775 struct merge_file_info
{
776 unsigned char sha
[20];
782 static int merge_3way(struct merge_options
*o
,
783 mmbuffer_t
*result_buf
,
784 struct diff_filespec
*one
,
785 struct diff_filespec
*a
,
786 struct diff_filespec
*b
,
790 mmfile_t orig
, src1
, src2
;
791 struct ll_merge_options ll_opts
= {0};
792 char *base_name
, *name1
, *name2
;
795 ll_opts
.renormalize
= o
->renormalize
;
796 ll_opts
.xdl_opts
= o
->xdl_opts
;
799 ll_opts
.virtual_ancestor
= 1;
802 switch (o
->recursive_variant
) {
803 case MERGE_RECURSIVE_OURS
:
804 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
806 case MERGE_RECURSIVE_THEIRS
:
807 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
815 if (strcmp(a
->path
, b
->path
) ||
816 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
817 base_name
= o
->ancestor
== NULL
? NULL
:
818 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
819 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
820 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
822 base_name
= o
->ancestor
== NULL
? NULL
:
823 xstrdup(mkpath("%s", o
->ancestor
));
824 name1
= xstrdup(mkpath("%s", branch1
));
825 name2
= xstrdup(mkpath("%s", branch2
));
828 read_mmblob(&orig
, one
->sha1
);
829 read_mmblob(&src1
, a
->sha1
);
830 read_mmblob(&src2
, b
->sha1
);
832 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
833 &src1
, name1
, &src2
, name2
, &ll_opts
);
843 static struct merge_file_info
merge_file(struct merge_options
*o
,
844 struct diff_filespec
*one
,
845 struct diff_filespec
*a
,
846 struct diff_filespec
*b
,
850 struct merge_file_info result
;
854 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
856 if (S_ISREG(a
->mode
)) {
857 result
.mode
= a
->mode
;
858 hashcpy(result
.sha
, a
->sha1
);
860 result
.mode
= b
->mode
;
861 hashcpy(result
.sha
, b
->sha1
);
864 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
870 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
871 result
.mode
= b
->mode
;
873 result
.mode
= a
->mode
;
874 if (b
->mode
!= one
->mode
) {
880 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
881 hashcpy(result
.sha
, b
->sha1
);
882 else if (sha_eq(b
->sha1
, one
->sha1
))
883 hashcpy(result
.sha
, a
->sha1
);
884 else if (S_ISREG(a
->mode
)) {
885 mmbuffer_t result_buf
;
888 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
891 if ((merge_status
< 0) || !result_buf
.ptr
)
892 die("Failed to execute internal merge");
894 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
895 blob_type
, result
.sha
))
896 die("Unable to add %s to database",
899 free(result_buf
.ptr
);
900 result
.clean
= (merge_status
== 0);
901 } else if (S_ISGITLINK(a
->mode
)) {
902 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
904 } else if (S_ISLNK(a
->mode
)) {
905 hashcpy(result
.sha
, a
->sha1
);
907 if (!sha_eq(a
->sha1
, b
->sha1
))
910 die("unsupported object type in the tree");
917 static void conflict_rename_delete(struct merge_options
*o
,
918 struct diff_filepair
*pair
,
919 const char *rename_branch
,
920 const char *other_branch
)
922 char *dest_name
= pair
->two
->path
;
926 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
928 pair
->one
->path
, pair
->two
->path
, rename_branch
,
931 update_stages(dest_name
, NULL
,
932 rename_branch
== o
->branch1
? pair
->two
: NULL
,
933 rename_branch
== o
->branch1
? NULL
: pair
->two
,
935 if (lstat(dest_name
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
936 dest_name
= unique_path(o
, dest_name
, rename_branch
);
939 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
944 static void conflict_rename_rename_1to2(struct merge_options
*o
,
945 struct diff_filepair
*pair1
,
947 struct diff_filepair
*pair2
,
950 /* One file was renamed in both branches, but to different names. */
953 const char *ren1_dst
= pair1
->two
->path
;
954 const char *ren2_dst
= pair2
->two
->path
;
955 const char *dst_name1
= ren1_dst
;
956 const char *dst_name2
= ren2_dst
;
958 if (lstat(ren1_dst
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
959 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
960 output(o
, 1, "%s is a directory in %s adding as %s instead",
961 ren1_dst
, branch2
, dst_name1
);
963 if (lstat(ren2_dst
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
964 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
965 output(o
, 1, "%s is a directory in %s adding as %s instead",
966 ren2_dst
, branch1
, dst_name2
);
969 remove_file_from_cache(dst_name1
);
970 remove_file_from_cache(dst_name2
);
972 * Uncomment to leave the conflicting names in the resulting tree
974 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
975 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
978 update_stages(ren1_dst
, NULL
, pair1
->two
, NULL
, 1);
979 update_stages(ren2_dst
, NULL
, NULL
, pair2
->two
, 1);
981 update_file(o
, 0, pair1
->two
->sha1
, pair1
->two
->mode
, dst_name1
);
982 update_file(o
, 0, pair2
->two
->sha1
, pair2
->two
->mode
, dst_name2
);
988 static void conflict_rename_rename_2to1(struct merge_options
*o
,
994 /* Two files were renamed to the same thing. */
995 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
996 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
997 output(o
, 1, "Renaming %s to %s and %s to %s instead",
998 ren1
->pair
->one
->path
, new_path1
,
999 ren2
->pair
->one
->path
, new_path2
);
1000 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
1001 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
1002 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
1007 static int process_renames(struct merge_options
*o
,
1008 struct string_list
*a_renames
,
1009 struct string_list
*b_renames
)
1011 int clean_merge
= 1, i
, j
;
1012 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1013 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1014 const struct rename
*sre
;
1016 for (i
= 0; i
< a_renames
->nr
; i
++) {
1017 sre
= a_renames
->items
[i
].util
;
1018 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1021 for (i
= 0; i
< b_renames
->nr
; i
++) {
1022 sre
= b_renames
->items
[i
].util
;
1023 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1027 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1029 struct string_list
*renames1
, *renames2Dst
;
1030 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1031 const char *branch1
, *branch2
;
1032 const char *ren1_src
, *ren1_dst
;
1034 if (i
>= a_renames
->nr
) {
1035 ren2
= b_renames
->items
[j
++].util
;
1036 } else if (j
>= b_renames
->nr
) {
1037 ren1
= a_renames
->items
[i
++].util
;
1039 int compare
= strcmp(a_renames
->items
[i
].string
,
1040 b_renames
->items
[j
].string
);
1042 ren1
= a_renames
->items
[i
++].util
;
1044 ren2
= b_renames
->items
[j
++].util
;
1047 /* TODO: refactor, so that 1/2 are not needed */
1049 renames1
= a_renames
;
1050 renames2Dst
= &b_by_dst
;
1051 branch1
= o
->branch1
;
1052 branch2
= o
->branch2
;
1055 renames1
= b_renames
;
1056 renames2Dst
= &a_by_dst
;
1057 branch1
= o
->branch2
;
1058 branch2
= o
->branch1
;
1063 src
= ren1
->pair
->one
->path
;
1065 ren1
->dst_entry
->processed
= 1;
1066 ren1
->src_entry
->processed
= 1;
1068 if (ren1
->processed
)
1070 ren1
->processed
= 1;
1072 ren1_src
= ren1
->pair
->one
->path
;
1073 ren1_dst
= ren1
->pair
->two
->path
;
1076 const char *ren2_src
= ren2
->pair
->one
->path
;
1077 const char *ren2_dst
= ren2
->pair
->two
->path
;
1078 /* Renamed in 1 and renamed in 2 */
1079 if (strcmp(ren1_src
, ren2_src
) != 0)
1080 die("ren1.src != ren2.src");
1081 ren2
->dst_entry
->processed
= 1;
1082 ren2
->processed
= 1;
1083 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1084 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO
,
1092 merge_rename_source(o
, ren1_src
, ren1
->src_entry
);
1093 update_stages_and_entry(ren1_dst
,
1101 /* Renamed in 1, maybe changed in 2 */
1102 struct string_list_item
*item
;
1103 /* we only use sha1 and mode of these */
1104 struct diff_filespec src_other
, dst_other
;
1108 * unpack_trees loads entries from common-commit
1109 * into stage 1, from head-commit into stage 2, and
1110 * from merge-commit into stage 3. We keep track
1111 * of which side corresponds to the rename.
1113 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1114 int other_stage
= a_renames
== renames1
? 3 : 2;
1117 ren1
->src_entry
->stages
[renamed_stage
].sha
,
1118 ren1
->src_entry
->stages
[renamed_stage
].mode
,
1119 ren1_src
, renamed_stage
== 3);
1121 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1122 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1123 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1124 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1127 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1128 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1129 ren1
->dst_entry
->processed
= 0;
1130 setup_rename_df_conflict_info(RENAME_DELETE
,
1139 conflict_rename_delete(o
, ren1
->pair
, branch1
, branch2
);
1141 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1142 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1143 /* Added file on the other side
1144 identical to the file being
1145 renamed: clean merge */
1146 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1147 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1148 const char *new_path
;
1151 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1153 ren1_src
, ren1_dst
, branch1
,
1155 if (o
->call_depth
) {
1156 struct merge_file_info mfi
;
1157 struct diff_filespec one
, a
, b
;
1159 one
.path
= a
.path
= b
.path
=
1161 hashcpy(one
.sha1
, null_sha1
);
1163 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
1164 a
.mode
= ren1
->pair
->two
->mode
;
1165 hashcpy(b
.sha1
, dst_other
.sha1
);
1166 b
.mode
= dst_other
.mode
;
1167 mfi
= merge_file(o
, &one
, &a
, &b
,
1170 output(o
, 1, "Adding merged %s", ren1_dst
);
1177 new_path
= unique_path(o
, ren1_dst
, branch2
);
1178 output(o
, 1, "Adding as %s instead", new_path
);
1179 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1181 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1184 ren2
->processed
= 1;
1185 output(o
, 1, "CONFLICT (rename/rename): "
1186 "Rename %s->%s in %s. "
1187 "Rename %s->%s in %s",
1188 ren1_src
, ren1_dst
, branch1
,
1189 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1190 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1195 struct diff_filespec
*one
, *a
, *b
;
1196 src_other
.path
= (char *)ren1_src
;
1198 one
= ren1
->pair
->one
;
1199 if (a_renames
== renames1
) {
1200 a
= ren1
->pair
->two
;
1203 b
= ren1
->pair
->two
;
1206 update_stages_and_entry(ren1_dst
, ren1
->dst_entry
, one
, a
, b
, 1);
1207 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1208 setup_rename_df_conflict_info(RENAME_NORMAL
,
1219 string_list_clear(&a_by_dst
, 0);
1220 string_list_clear(&b_by_dst
, 0);
1225 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1227 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1230 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1233 enum object_type type
;
1235 buf
= read_sha1_file(sha1
, &type
, &size
);
1237 return error("cannot read object %s", sha1_to_hex(sha1
));
1238 if (type
!= OBJ_BLOB
) {
1240 return error("object %s is not a blob", sha1_to_hex(sha1
));
1242 strbuf_attach(dst
, buf
, size
, size
+ 1);
1246 static int blob_unchanged(const unsigned char *o_sha
,
1247 const unsigned char *a_sha
,
1248 int renormalize
, const char *path
)
1250 struct strbuf o
= STRBUF_INIT
;
1251 struct strbuf a
= STRBUF_INIT
;
1252 int ret
= 0; /* assume changed for safety */
1254 if (sha_eq(o_sha
, a_sha
))
1259 assert(o_sha
&& a_sha
);
1260 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1263 * Note: binary | is used so that both renormalizations are
1264 * performed. Comparison can be skipped if both files are
1265 * unchanged since their sha1s have already been compared.
1267 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1268 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1269 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1277 static void handle_delete_modify(struct merge_options
*o
,
1279 const char *new_path
,
1280 unsigned char *a_sha
, int a_mode
,
1281 unsigned char *b_sha
, int b_mode
)
1284 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1285 "and modified in %s. Version %s of %s left in tree%s%s.",
1287 o
->branch2
, o
->branch2
, path
,
1288 path
== new_path
? "" : " at ",
1289 path
== new_path
? "" : new_path
);
1290 update_file(o
, 0, b_sha
, b_mode
, new_path
);
1292 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1293 "and modified in %s. Version %s of %s left in tree%s%s.",
1295 o
->branch1
, o
->branch1
, path
,
1296 path
== new_path
? "" : " at ",
1297 path
== new_path
? "" : new_path
);
1298 update_file(o
, 0, a_sha
, a_mode
, new_path
);
1302 static int merge_content(struct merge_options
*o
,
1304 unsigned char *o_sha
, int o_mode
,
1305 unsigned char *a_sha
, int a_mode
,
1306 unsigned char *b_sha
, int b_mode
,
1307 const char *df_rename_conflict_branch
)
1309 const char *reason
= "content";
1310 struct merge_file_info mfi
;
1311 struct diff_filespec one
, a
, b
;
1313 unsigned df_conflict_remains
= 0;
1317 o_sha
= (unsigned char *)null_sha1
;
1319 one
.path
= a
.path
= b
.path
= (char *)path
;
1320 hashcpy(one
.sha1
, o_sha
);
1322 hashcpy(a
.sha1
, a_sha
);
1324 hashcpy(b
.sha1
, b_sha
);
1327 mfi
= merge_file(o
, &one
, &a
, &b
, o
->branch1
, o
->branch2
);
1328 if (df_rename_conflict_branch
&&
1329 lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1330 df_conflict_remains
= 1;
1333 if (mfi
.clean
&& !df_conflict_remains
&&
1334 sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a
.mode
&&
1335 !o
->call_depth
&& !lstat(path
, &st
)) {
1336 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1337 add_cacheinfo(mfi
.mode
, mfi
.sha
, path
,
1338 0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
1341 output(o
, 2, "Auto-merging %s", path
);
1344 if (S_ISGITLINK(mfi
.mode
))
1345 reason
= "submodule";
1346 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1350 if (df_conflict_remains
) {
1351 const char *new_path
;
1352 update_file_flags(o
, mfi
.sha
, mfi
.mode
, path
,
1353 o
->call_depth
|| mfi
.clean
, 0);
1354 new_path
= unique_path(o
, path
, df_rename_conflict_branch
);
1356 output(o
, 1, "Adding as %s instead", new_path
);
1357 update_file_flags(o
, mfi
.sha
, mfi
.mode
, new_path
, 0, 1);
1359 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1365 /* Per entry merge function */
1366 static int process_entry(struct merge_options
*o
,
1367 const char *path
, struct stage_data
*entry
)
1370 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1371 print_index_entry("\tpath: ", entry);
1373 int clean_merge
= 1;
1374 int normalize
= o
->renormalize
;
1375 unsigned o_mode
= entry
->stages
[1].mode
;
1376 unsigned a_mode
= entry
->stages
[2].mode
;
1377 unsigned b_mode
= entry
->stages
[3].mode
;
1378 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1379 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1380 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1382 if (entry
->rename_df_conflict_info
)
1383 return 1; /* Such cases are handled elsewhere. */
1385 entry
->processed
= 1;
1386 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1387 /* Case A: Deleted in one */
1388 if ((!a_sha
&& !b_sha
) ||
1389 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1390 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1391 /* Deleted in both or deleted in one and
1392 * unchanged in the other */
1394 output(o
, 2, "Removing %s", path
);
1395 /* do not touch working file if it did not exist */
1396 remove_file(o
, 1, path
, !a_sha
);
1397 } else if (string_list_has_string(&o
->current_directory_set
,
1399 entry
->processed
= 0;
1400 return 1; /* Assume clean until processed */
1402 /* Deleted in one and changed in the other */
1404 handle_delete_modify(o
, path
, path
,
1405 a_sha
, a_mode
, b_sha
, b_mode
);
1408 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1409 (!o_sha
&& !a_sha
&& b_sha
)) {
1410 /* Case B: Added in one. */
1412 const unsigned char *sha
;
1421 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1422 /* Handle D->F conflicts after all subfiles */
1423 entry
->processed
= 0;
1424 return 1; /* Assume clean until processed */
1426 output(o
, 2, "Adding %s", path
);
1427 update_file(o
, 1, sha
, mode
, path
);
1429 } else if (a_sha
&& b_sha
) {
1430 /* Case C: Added in both (check for same permissions) and */
1431 /* case D: Modified in both, but differently. */
1432 clean_merge
= merge_content(o
, path
,
1433 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1435 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1437 * this entry was deleted altogether. a_mode == 0 means
1438 * we had that path and want to actively remove it.
1440 remove_file(o
, 1, path
, !a_mode
);
1442 die("Fatal merge failure, shouldn't happen.");
1448 * Per entry merge function for D/F (and/or rename) conflicts. In the
1449 * cases we can cleanly resolve D/F conflicts, process_entry() can
1450 * clean out all the files below the directory for us. All D/F
1451 * conflict cases must be handled here at the end to make sure any
1452 * directories that can be cleaned out, are.
1454 * Some rename conflicts may also be handled here that don't necessarily
1455 * involve D/F conflicts, since the code to handle them is generic enough
1456 * to handle those rename conflicts with or without D/F conflicts also
1459 static int process_df_entry(struct merge_options
*o
,
1460 const char *path
, struct stage_data
*entry
)
1462 int clean_merge
= 1;
1463 unsigned o_mode
= entry
->stages
[1].mode
;
1464 unsigned a_mode
= entry
->stages
[2].mode
;
1465 unsigned b_mode
= entry
->stages
[3].mode
;
1466 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1467 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1468 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1471 entry
->processed
= 1;
1472 if (entry
->rename_df_conflict_info
) {
1473 struct rename_df_conflict_info
*conflict_info
= entry
->rename_df_conflict_info
;
1475 switch (conflict_info
->rename_type
) {
1477 clean_merge
= merge_content(o
, path
,
1478 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1479 conflict_info
->branch1
);
1483 conflict_rename_delete(o
, conflict_info
->pair1
,
1484 conflict_info
->branch1
,
1485 conflict_info
->branch2
);
1487 case RENAME_ONE_FILE_TO_TWO
:
1488 src
= conflict_info
->pair1
->one
->path
;
1490 output(o
, 1, "CONFLICT (rename/rename): "
1491 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1492 "rename \"%s\"->\"%s\" in \"%s\"%s",
1493 src
, conflict_info
->pair1
->two
->path
, conflict_info
->branch1
,
1494 src
, conflict_info
->pair2
->two
->path
, conflict_info
->branch2
,
1495 o
->call_depth
? " (left unresolved)" : "");
1496 if (o
->call_depth
) {
1497 remove_file_from_cache(src
);
1498 update_file(o
, 0, conflict_info
->pair1
->one
->sha1
,
1499 conflict_info
->pair1
->one
->mode
, src
);
1501 conflict_rename_rename_1to2(o
, conflict_info
->pair1
,
1502 conflict_info
->branch1
,
1503 conflict_info
->pair2
,
1504 conflict_info
->branch2
);
1505 conflict_info
->dst_entry2
->processed
= 1;
1508 entry
->processed
= 0;
1511 } else if (o_sha
&& (!a_sha
|| !b_sha
)) {
1512 /* Modify/delete; deleted side may have put a directory in the way */
1513 const char *new_path
= path
;
1514 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
))
1515 new_path
= unique_path(o
, path
, a_sha
? o
->branch1
: o
->branch2
);
1517 handle_delete_modify(o
, path
, new_path
,
1518 a_sha
, a_mode
, b_sha
, b_mode
);
1519 } else if (!o_sha
&& !!a_sha
!= !!b_sha
) {
1520 /* directory -> (directory, file) */
1521 const char *add_branch
;
1522 const char *other_branch
;
1524 const unsigned char *sha
;
1528 add_branch
= o
->branch1
;
1529 other_branch
= o
->branch2
;
1532 conf
= "file/directory";
1534 add_branch
= o
->branch2
;
1535 other_branch
= o
->branch1
;
1538 conf
= "directory/file";
1540 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1541 const char *new_path
= unique_path(o
, path
, add_branch
);
1543 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1545 conf
, path
, other_branch
, path
, new_path
);
1546 update_file(o
, 0, sha
, mode
, new_path
);
1548 output(o
, 2, "Adding %s", path
);
1549 update_file(o
, 1, sha
, mode
, path
);
1552 entry
->processed
= 0;
1553 return 1; /* not handled; assume clean until processed */
1559 int merge_trees(struct merge_options
*o
,
1562 struct tree
*common
,
1563 struct tree
**result
)
1567 if (o
->subtree_shift
) {
1568 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1569 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1572 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1573 output(o
, 0, "Already up-to-date!");
1578 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1581 if (show(o
, 4) || o
->call_depth
)
1582 die("merging of trees %s and %s failed",
1583 sha1_to_hex(head
->object
.sha1
),
1584 sha1_to_hex(merge
->object
.sha1
));
1589 if (unmerged_cache()) {
1590 struct string_list
*entries
, *re_head
, *re_merge
;
1592 string_list_clear(&o
->current_file_set
, 1);
1593 string_list_clear(&o
->current_directory_set
, 1);
1594 get_files_dirs(o
, head
);
1595 get_files_dirs(o
, merge
);
1597 entries
= get_unmerged();
1598 make_room_for_directories_of_df_conflicts(o
, entries
);
1599 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1600 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1601 clean
= process_renames(o
, re_head
, re_merge
);
1602 for (i
= 0; i
< entries
->nr
; i
++) {
1603 const char *path
= entries
->items
[i
].string
;
1604 struct stage_data
*e
= entries
->items
[i
].util
;
1606 && !process_entry(o
, path
, e
))
1609 for (i
= 0; i
< entries
->nr
; i
++) {
1610 const char *path
= entries
->items
[i
].string
;
1611 struct stage_data
*e
= entries
->items
[i
].util
;
1613 && !process_df_entry(o
, path
, e
))
1616 for (i
= 0; i
< entries
->nr
; i
++) {
1617 struct stage_data
*e
= entries
->items
[i
].util
;
1619 die("Unprocessed path??? %s",
1620 entries
->items
[i
].string
);
1623 string_list_clear(re_merge
, 0);
1624 string_list_clear(re_head
, 0);
1625 string_list_clear(entries
, 1);
1632 *result
= write_tree_from_memory(o
);
1637 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1639 struct commit_list
*next
= NULL
, *current
, *backup
;
1640 for (current
= list
; current
; current
= backup
) {
1641 backup
= current
->next
;
1642 current
->next
= next
;
1649 * Merge the commits h1 and h2, return the resulting virtual
1650 * commit object and a flag indicating the cleanness of the merge.
1652 int merge_recursive(struct merge_options
*o
,
1655 struct commit_list
*ca
,
1656 struct commit
**result
)
1658 struct commit_list
*iter
;
1659 struct commit
*merged_common_ancestors
;
1660 struct tree
*mrtree
= mrtree
;
1664 output(o
, 4, "Merging:");
1665 output_commit_title(o
, h1
);
1666 output_commit_title(o
, h2
);
1670 ca
= get_merge_bases(h1
, h2
, 1);
1671 ca
= reverse_commit_list(ca
);
1675 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1676 for (iter
= ca
; iter
; iter
= iter
->next
)
1677 output_commit_title(o
, iter
->item
);
1680 merged_common_ancestors
= pop_commit(&ca
);
1681 if (merged_common_ancestors
== NULL
) {
1682 /* if there is no common ancestor, make an empty tree */
1683 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1685 tree
->object
.parsed
= 1;
1686 tree
->object
.type
= OBJ_TREE
;
1687 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1688 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1691 for (iter
= ca
; iter
; iter
= iter
->next
) {
1692 const char *saved_b1
, *saved_b2
;
1695 * When the merge fails, the result contains files
1696 * with conflict markers. The cleanness flag is
1697 * ignored, it was never actually used, as result of
1698 * merge_trees has always overwritten it: the committed
1699 * "conflicts" were already resolved.
1702 saved_b1
= o
->branch1
;
1703 saved_b2
= o
->branch2
;
1704 o
->branch1
= "Temporary merge branch 1";
1705 o
->branch2
= "Temporary merge branch 2";
1706 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1707 NULL
, &merged_common_ancestors
);
1708 o
->branch1
= saved_b1
;
1709 o
->branch2
= saved_b2
;
1712 if (!merged_common_ancestors
)
1713 die("merge returned no commit");
1720 o
->ancestor
= "merged common ancestors";
1721 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1724 if (o
->call_depth
) {
1725 *result
= make_virtual_commit(mrtree
, "merged tree");
1726 commit_list_insert(h1
, &(*result
)->parents
);
1727 commit_list_insert(h2
, &(*result
)->parents
->next
);
1731 diff_warn_rename_limit("merge.renamelimit",
1732 o
->needed_rename_limit
, 0);
1736 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1738 struct object
*object
;
1740 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1743 if (object
->type
== OBJ_TREE
)
1744 return make_virtual_commit((struct tree
*)object
, name
);
1745 if (object
->type
!= OBJ_COMMIT
)
1747 if (parse_commit((struct commit
*)object
))
1749 return (struct commit
*)object
;
1752 int merge_recursive_generic(struct merge_options
*o
,
1753 const unsigned char *head
,
1754 const unsigned char *merge
,
1756 const unsigned char **base_list
,
1757 struct commit
**result
)
1759 int clean
, index_fd
;
1760 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1761 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1762 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1763 struct commit_list
*ca
= NULL
;
1767 for (i
= 0; i
< num_base_list
; ++i
) {
1768 struct commit
*base
;
1769 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1770 return error("Could not parse object '%s'",
1771 sha1_to_hex(base_list
[i
]));
1772 commit_list_insert(base
, &ca
);
1776 index_fd
= hold_locked_index(lock
, 1);
1777 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1779 if (active_cache_changed
&&
1780 (write_cache(index_fd
, active_cache
, active_nr
) ||
1781 commit_locked_index(lock
)))
1782 return error("Unable to write index.");
1784 return clean
? 0 : 1;
1787 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1789 struct merge_options
*o
= cb
;
1790 if (!strcasecmp(var
, "merge.verbosity")) {
1791 o
->verbosity
= git_config_int(var
, value
);
1794 if (!strcasecmp(var
, "diff.renamelimit")) {
1795 o
->diff_rename_limit
= git_config_int(var
, value
);
1798 if (!strcasecmp(var
, "merge.renamelimit")) {
1799 o
->merge_rename_limit
= git_config_int(var
, value
);
1802 return git_xmerge_config(var
, value
, cb
);
1805 void init_merge_options(struct merge_options
*o
)
1807 memset(o
, 0, sizeof(struct merge_options
));
1809 o
->buffer_output
= 1;
1810 o
->diff_rename_limit
= -1;
1811 o
->merge_rename_limit
= -1;
1813 git_config(merge_recursive_config
, o
);
1814 if (getenv("GIT_MERGE_VERBOSITY"))
1816 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1817 if (o
->verbosity
>= 5)
1818 o
->buffer_output
= 0;
1819 strbuf_init(&o
->obuf
, 0);
1820 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1821 o
->current_file_set
.strdup_strings
= 1;
1822 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1823 o
->current_directory_set
.strdup_strings
= 1;
1826 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1830 if (!strcmp(s
, "ours"))
1831 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1832 else if (!strcmp(s
, "theirs"))
1833 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1834 else if (!strcmp(s
, "subtree"))
1835 o
->subtree_shift
= "";
1836 else if (!prefixcmp(s
, "subtree="))
1837 o
->subtree_shift
= s
+ strlen("subtree=");
1838 else if (!strcmp(s
, "patience"))
1839 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1840 else if (!strcmp(s
, "ignore-space-change"))
1841 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1842 else if (!strcmp(s
, "ignore-all-space"))
1843 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1844 else if (!strcmp(s
, "ignore-space-at-eol"))
1845 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1846 else if (!strcmp(s
, "renormalize"))
1848 else if (!strcmp(s
, "no-renormalize"))
1850 else if (!prefixcmp(s
, "rename-threshold=")) {
1851 const char *score
= s
+ strlen("rename-threshold=");
1852 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)