2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
9 #include "cache-tree.h"
13 #include "tree-walk.h"
17 #include "unpack-trees.h"
18 #include "string-list.h"
19 #include "xdiff-interface.h"
22 #include "merge-recursive.h"
24 #include "submodule.h"
26 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
27 const char *subtree_shift
)
29 struct object_id shifted
;
31 if (!*subtree_shift
) {
32 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
34 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
37 if (!oidcmp(&two
->object
.oid
, &shifted
))
39 return lookup_tree(shifted
.hash
);
42 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
44 struct commit
*commit
= alloc_commit_node();
45 struct merge_remote_desc
*desc
= xmalloc(sizeof(*desc
));
48 desc
->obj
= (struct object
*)commit
;
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 oid_eq(const struct object_id
*a
, const struct object_id
*b
)
63 return a
&& b
&& oidcmp(a
, b
) == 0;
69 RENAME_ONE_FILE_TO_ONE
,
70 RENAME_ONE_FILE_TO_TWO
,
71 RENAME_TWO_FILES_TO_ONE
74 struct rename_conflict_info
{
75 enum rename_type rename_type
;
76 struct diff_filepair
*pair1
;
77 struct diff_filepair
*pair2
;
80 struct stage_data
*dst_entry1
;
81 struct stage_data
*dst_entry2
;
82 struct diff_filespec ren1_other
;
83 struct diff_filespec ren2_other
;
87 * Since we want to write the index eventually, we cannot reuse the index
88 * for these (temporary) data.
95 struct rename_conflict_info
*rename_conflict_info
;
99 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
100 struct diff_filepair
*pair1
,
101 struct diff_filepair
*pair2
,
104 struct stage_data
*dst_entry1
,
105 struct stage_data
*dst_entry2
,
106 struct merge_options
*o
,
107 struct stage_data
*src_entry1
,
108 struct stage_data
*src_entry2
)
110 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_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_conflict_info
= ci
;
118 dst_entry1
->processed
= 0;
120 assert(!pair2
== !dst_entry2
);
122 ci
->dst_entry2
= dst_entry2
;
124 dst_entry2
->rename_conflict_info
= ci
;
127 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
129 * For each rename, there could have been
130 * modifications on the side of history where that
131 * file was not renamed.
133 int ostage1
= o
->branch1
== branch1
? 3 : 2;
134 int ostage2
= ostage1
^ 1;
136 ci
->ren1_other
.path
= pair1
->one
->path
;
137 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
138 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
140 ci
->ren2_other
.path
= pair2
->one
->path
;
141 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
142 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
146 static int show(struct merge_options
*o
, int v
)
148 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
151 static void flush_output(struct merge_options
*o
)
154 fputs(o
->obuf
.buf
, stdout
);
155 strbuf_reset(&o
->obuf
);
159 __attribute__((format (printf
, 3, 4)))
160 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
167 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
170 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
173 strbuf_addch(&o
->obuf
, '\n');
174 if (!o
->buffer_output
)
178 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
182 for (i
= o
->call_depth
; i
--;)
185 printf("virtual %s\n", merge_remote_util(commit
)->name
);
187 printf("%s ", find_unique_abbrev(commit
->object
.oid
.hash
, DEFAULT_ABBREV
));
188 if (parse_commit(commit
) != 0)
189 printf(_("(bad commit)\n"));
192 const char *msg
= get_commit_buffer(commit
, NULL
);
193 int len
= find_commit_subject(msg
, &title
);
195 printf("%.*s\n", len
, title
);
196 unuse_commit_buffer(commit
, msg
);
201 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
202 const char *path
, int stage
, int refresh
, int options
)
204 struct cache_entry
*ce
;
207 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
209 return error(_("addinfo_cache failed for path '%s'"), path
);
211 ret
= add_cache_entry(ce
, options
);
213 struct cache_entry
*nce
;
215 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
217 ret
= add_cache_entry(nce
, options
);
222 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
225 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
228 static int git_merge_trees(int index_only
,
234 struct tree_desc t
[3];
235 struct unpack_trees_options opts
;
237 memset(&opts
, 0, sizeof(opts
));
244 opts
.fn
= threeway_merge
;
245 opts
.src_index
= &the_index
;
246 opts
.dst_index
= &the_index
;
247 setup_unpack_trees_porcelain(&opts
, "merge");
249 init_tree_desc_from_tree(t
+0, common
);
250 init_tree_desc_from_tree(t
+1, head
);
251 init_tree_desc_from_tree(t
+2, merge
);
253 rc
= unpack_trees(3, t
, &opts
);
254 cache_tree_free(&active_cache_tree
);
258 struct tree
*write_tree_from_memory(struct merge_options
*o
)
260 struct tree
*result
= NULL
;
262 if (unmerged_cache()) {
264 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
265 for (i
= 0; i
< active_nr
; i
++) {
266 const struct cache_entry
*ce
= active_cache
[i
];
268 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
269 (int)ce_namelen(ce
), ce
->name
);
271 die("BUG: unmerged index entries in merge-recursive.c");
274 if (!active_cache_tree
)
275 active_cache_tree
= cache_tree();
277 if (!cache_tree_fully_valid(active_cache_tree
) &&
278 cache_tree_update(&the_index
, 0) < 0)
279 die(_("error building trees"));
281 result
= lookup_tree(active_cache_tree
->sha1
);
286 static int save_files_dirs(const unsigned char *sha1
,
287 struct strbuf
*base
, const char *path
,
288 unsigned int mode
, int stage
, void *context
)
290 int baselen
= base
->len
;
291 struct merge_options
*o
= context
;
293 strbuf_addstr(base
, path
);
296 string_list_insert(&o
->current_directory_set
, base
->buf
);
298 string_list_insert(&o
->current_file_set
, base
->buf
);
300 strbuf_setlen(base
, baselen
);
301 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
304 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
307 struct pathspec match_all
;
308 memset(&match_all
, 0, sizeof(match_all
));
309 if (read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
))
311 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
316 * Returns an index_entry instance which doesn't have to correspond to
317 * a real cache entry in Git's index.
319 static struct stage_data
*insert_stage_data(const char *path
,
320 struct tree
*o
, struct tree
*a
, struct tree
*b
,
321 struct string_list
*entries
)
323 struct string_list_item
*item
;
324 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
325 get_tree_entry(o
->object
.oid
.hash
, path
,
326 e
->stages
[1].oid
.hash
, &e
->stages
[1].mode
);
327 get_tree_entry(a
->object
.oid
.hash
, path
,
328 e
->stages
[2].oid
.hash
, &e
->stages
[2].mode
);
329 get_tree_entry(b
->object
.oid
.hash
, path
,
330 e
->stages
[3].oid
.hash
, &e
->stages
[3].mode
);
331 item
= string_list_insert(entries
, path
);
337 * Create a dictionary mapping file names to stage_data objects. The
338 * dictionary contains one entry for every path with a non-zero stage entry.
340 static struct string_list
*get_unmerged(void)
342 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
345 unmerged
->strdup_strings
= 1;
347 for (i
= 0; i
< active_nr
; i
++) {
348 struct string_list_item
*item
;
349 struct stage_data
*e
;
350 const struct cache_entry
*ce
= active_cache
[i
];
354 item
= string_list_lookup(unmerged
, ce
->name
);
356 item
= string_list_insert(unmerged
, ce
->name
);
357 item
->util
= xcalloc(1, sizeof(struct stage_data
));
360 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
361 hashcpy(e
->stages
[ce_stage(ce
)].oid
.hash
, ce
->sha1
);
367 static int string_list_df_name_compare(const void *a
, const void *b
)
369 const struct string_list_item
*one
= a
;
370 const struct string_list_item
*two
= b
;
371 int onelen
= strlen(one
->string
);
372 int twolen
= strlen(two
->string
);
374 * Here we only care that entries for D/F conflicts are
375 * adjacent, in particular with the file of the D/F conflict
376 * appearing before files below the corresponding directory.
377 * The order of the rest of the list is irrelevant for us.
379 * To achieve this, we sort with df_name_compare and provide
380 * the mode S_IFDIR so that D/F conflicts will sort correctly.
381 * We use the mode S_IFDIR for everything else for simplicity,
382 * since in other cases any changes in their order due to
383 * sorting cause no problems for us.
385 int cmp
= df_name_compare(one
->string
, onelen
, S_IFDIR
,
386 two
->string
, twolen
, S_IFDIR
);
388 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
389 * that 'foo' comes before 'foo/bar'.
393 return onelen
- twolen
;
396 static void record_df_conflict_files(struct merge_options
*o
,
397 struct string_list
*entries
)
399 /* If there is a D/F conflict and the file for such a conflict
400 * currently exist in the working tree, we want to allow it to be
401 * removed to make room for the corresponding directory if needed.
402 * The files underneath the directories of such D/F conflicts will
403 * be processed before the corresponding file involved in the D/F
404 * conflict. If the D/F directory ends up being removed by the
405 * merge, then we won't have to touch the D/F file. If the D/F
406 * directory needs to be written to the working copy, then the D/F
407 * file will simply be removed (in make_room_for_path()) to make
408 * room for the necessary paths. Note that if both the directory
409 * and the file need to be present, then the D/F file will be
410 * reinstated with a new unique name at the time it is processed.
412 struct string_list df_sorted_entries
;
413 const char *last_file
= NULL
;
418 * If we're merging merge-bases, we don't want to bother with
419 * any working directory changes.
424 /* Ensure D/F conflicts are adjacent in the entries list. */
425 memset(&df_sorted_entries
, 0, sizeof(struct string_list
));
426 for (i
= 0; i
< entries
->nr
; i
++) {
427 struct string_list_item
*next
= &entries
->items
[i
];
428 string_list_append(&df_sorted_entries
, next
->string
)->util
=
431 qsort(df_sorted_entries
.items
, entries
->nr
, sizeof(*entries
->items
),
432 string_list_df_name_compare
);
434 string_list_clear(&o
->df_conflict_file_set
, 1);
435 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
436 const char *path
= df_sorted_entries
.items
[i
].string
;
437 int len
= strlen(path
);
438 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
441 * Check if last_file & path correspond to a D/F conflict;
442 * i.e. whether path is last_file+'/'+<something>.
443 * If so, record that it's okay to remove last_file to make
444 * room for path and friends if needed.
448 memcmp(path
, last_file
, last_len
) == 0 &&
449 path
[last_len
] == '/') {
450 string_list_insert(&o
->df_conflict_file_set
, last_file
);
454 * Determine whether path could exist as a file in the
455 * working directory as a possible D/F conflict. This
456 * will only occur when it exists in stage 2 as a
459 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
466 string_list_clear(&df_sorted_entries
, 0);
470 struct diff_filepair
*pair
;
471 struct stage_data
*src_entry
;
472 struct stage_data
*dst_entry
;
473 unsigned processed
:1;
477 * Get information of all renames which occurred between 'o_tree' and
478 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
479 * 'b_tree') to be able to associate the correct cache entries with
480 * the rename information. 'tree' is always equal to either a_tree or b_tree.
482 static struct string_list
*get_renames(struct merge_options
*o
,
487 struct string_list
*entries
)
490 struct string_list
*renames
;
491 struct diff_options opts
;
493 renames
= xcalloc(1, sizeof(struct string_list
));
494 if (!o
->detect_rename
)
498 DIFF_OPT_SET(&opts
, RECURSIVE
);
499 DIFF_OPT_CLR(&opts
, RENAME_EMPTY
);
500 opts
.detect_rename
= DIFF_DETECT_RENAME
;
501 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
502 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
504 opts
.rename_score
= o
->rename_score
;
505 opts
.show_rename_progress
= o
->show_rename_progress
;
506 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
507 diff_setup_done(&opts
);
508 diff_tree_sha1(o_tree
->object
.oid
.hash
, tree
->object
.oid
.hash
, "", &opts
);
510 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
511 o
->needed_rename_limit
= opts
.needed_rename_limit
;
512 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
513 struct string_list_item
*item
;
515 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
516 if (pair
->status
!= 'R') {
517 diff_free_filepair(pair
);
520 re
= xmalloc(sizeof(*re
));
523 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
525 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
526 o_tree
, a_tree
, b_tree
, entries
);
528 re
->src_entry
= item
->util
;
530 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
532 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
533 o_tree
, a_tree
, b_tree
, entries
);
535 re
->dst_entry
= item
->util
;
536 item
= string_list_insert(renames
, pair
->one
->path
);
539 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
540 diff_queued_diff
.nr
= 0;
545 static int update_stages(const char *path
, const struct diff_filespec
*o
,
546 const struct diff_filespec
*a
,
547 const struct diff_filespec
*b
)
551 * NOTE: It is usually a bad idea to call update_stages on a path
552 * before calling update_file on that same path, since it can
553 * sometimes lead to spurious "refusing to lose untracked file..."
554 * messages from update_file (via make_room_for path via
555 * would_lose_untracked). Instead, reverse the order of the calls
556 * (executing update_file first and then update_stages).
559 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
561 if (remove_file_from_cache(path
))
564 if (add_cacheinfo(o
->mode
, &o
->oid
, path
, 1, 0, options
))
567 if (add_cacheinfo(a
->mode
, &a
->oid
, path
, 2, 0, options
))
570 if (add_cacheinfo(b
->mode
, &b
->oid
, path
, 3, 0, options
))
575 static void update_entry(struct stage_data
*entry
,
576 struct diff_filespec
*o
,
577 struct diff_filespec
*a
,
578 struct diff_filespec
*b
)
580 entry
->processed
= 0;
581 entry
->stages
[1].mode
= o
->mode
;
582 entry
->stages
[2].mode
= a
->mode
;
583 entry
->stages
[3].mode
= b
->mode
;
584 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
585 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
586 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
589 static int remove_file(struct merge_options
*o
, int clean
,
590 const char *path
, int no_wd
)
592 int update_cache
= o
->call_depth
|| clean
;
593 int update_working_directory
= !o
->call_depth
&& !no_wd
;
596 if (remove_file_from_cache(path
))
599 if (update_working_directory
) {
601 struct cache_entry
*ce
;
602 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
603 if (ce
&& ce_stage(ce
) == 0)
606 if (remove_path(path
))
612 /* add a string to a strbuf, but converting "/" to "_" */
613 static void add_flattened_path(struct strbuf
*out
, const char *s
)
616 strbuf_addstr(out
, s
);
617 for (; i
< out
->len
; i
++)
618 if (out
->buf
[i
] == '/')
622 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
624 struct strbuf newpath
= STRBUF_INIT
;
628 strbuf_addf(&newpath
, "%s~", path
);
629 add_flattened_path(&newpath
, branch
);
631 base_len
= newpath
.len
;
632 while (string_list_has_string(&o
->current_file_set
, newpath
.buf
) ||
633 string_list_has_string(&o
->current_directory_set
, newpath
.buf
) ||
634 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
635 strbuf_setlen(&newpath
, base_len
);
636 strbuf_addf(&newpath
, "_%d", suffix
++);
639 string_list_insert(&o
->current_file_set
, newpath
.buf
);
640 return strbuf_detach(&newpath
, NULL
);
643 static int dir_in_way(const char *path
, int check_working_copy
)
646 struct strbuf dirpath
= STRBUF_INIT
;
649 strbuf_addstr(&dirpath
, path
);
650 strbuf_addch(&dirpath
, '/');
652 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
656 if (pos
< active_nr
&&
657 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
658 strbuf_release(&dirpath
);
662 strbuf_release(&dirpath
);
663 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
666 static int was_tracked(const char *path
)
668 int pos
= cache_name_pos(path
, strlen(path
));
671 /* we have been tracking this path */
675 * Look for an unmerged entry for the path,
676 * specifically stage #2, which would indicate
677 * that "our" side before the merge started
678 * had the path tracked (and resulted in a conflict).
681 pos
< active_nr
&& !strcmp(path
, active_cache
[pos
]->name
);
683 if (ce_stage(active_cache
[pos
]) == 2)
688 static int would_lose_untracked(const char *path
)
690 return !was_tracked(path
) && file_exists(path
);
693 static int make_room_for_path(struct merge_options
*o
, const char *path
)
696 const char *msg
= _("failed to create path '%s'%s");
698 /* Unlink any D/F conflict files that are in the way */
699 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
700 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
701 size_t pathlen
= strlen(path
);
702 size_t df_pathlen
= strlen(df_path
);
703 if (df_pathlen
< pathlen
&&
704 path
[df_pathlen
] == '/' &&
705 strncmp(path
, df_path
, df_pathlen
) == 0) {
707 _("Removing %s to make room for subdirectory\n"),
710 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
716 /* Make sure leading directories are created */
717 status
= safe_create_leading_directories_const(path
);
719 if (status
== SCLD_EXISTS
) {
720 /* something else exists */
721 error(msg
, path
, _(": perhaps a D/F conflict?"));
728 * Do not unlink a file in the work tree if we are not
731 if (would_lose_untracked(path
))
732 return error(_("refusing to lose untracked file at '%s'"),
735 /* Successful unlink is good.. */
738 /* .. and so is no existing file */
741 /* .. but not some other error (who really cares what?) */
742 return error(msg
, path
, _(": perhaps a D/F conflict?"));
745 static void update_file_flags(struct merge_options
*o
,
746 const struct object_id
*oid
,
756 enum object_type type
;
760 if (S_ISGITLINK(mode
)) {
762 * We may later decide to recursively descend into
763 * the submodule directory and update its index
764 * and/or work tree, but we do not do that now.
770 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
772 die(_("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
773 if (type
!= OBJ_BLOB
)
774 die(_("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
776 struct strbuf strbuf
= STRBUF_INIT
;
777 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
780 buf
= strbuf_detach(&strbuf
, NULL
);
784 if (make_room_for_path(o
, path
) < 0) {
789 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
795 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
797 die_errno(_("failed to open '%s'"), path
);
798 write_in_full(fd
, buf
, size
);
800 } else if (S_ISLNK(mode
)) {
801 char *lnk
= xmemdupz(buf
, size
);
802 safe_create_leading_directories_const(path
);
804 if (symlink(lnk
, path
))
805 die_errno(_("failed to symlink '%s'"), path
);
808 die(_("do not know what to do with %06o %s '%s'"),
809 mode
, oid_to_hex(oid
), path
);
814 add_cacheinfo(mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
817 static void update_file(struct merge_options
*o
,
819 const struct object_id
*oid
,
823 update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
826 /* Low level file merging, update and removal */
828 struct merge_file_info
{
829 struct object_id oid
;
835 static int merge_3way(struct merge_options
*o
,
836 mmbuffer_t
*result_buf
,
837 const struct diff_filespec
*one
,
838 const struct diff_filespec
*a
,
839 const struct diff_filespec
*b
,
843 mmfile_t orig
, src1
, src2
;
844 struct ll_merge_options ll_opts
= {0};
845 char *base_name
, *name1
, *name2
;
848 ll_opts
.renormalize
= o
->renormalize
;
849 ll_opts
.xdl_opts
= o
->xdl_opts
;
852 ll_opts
.virtual_ancestor
= 1;
855 switch (o
->recursive_variant
) {
856 case MERGE_RECURSIVE_OURS
:
857 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
859 case MERGE_RECURSIVE_THEIRS
:
860 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
868 if (strcmp(a
->path
, b
->path
) ||
869 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
870 base_name
= o
->ancestor
== NULL
? NULL
:
871 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
872 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
873 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
875 base_name
= o
->ancestor
== NULL
? NULL
:
876 mkpathdup("%s", o
->ancestor
);
877 name1
= mkpathdup("%s", branch1
);
878 name2
= mkpathdup("%s", branch2
);
881 read_mmblob(&orig
, one
->oid
.hash
);
882 read_mmblob(&src1
, a
->oid
.hash
);
883 read_mmblob(&src2
, b
->oid
.hash
);
885 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
886 &src1
, name1
, &src2
, name2
, &ll_opts
);
897 static int merge_file_1(struct merge_options
*o
,
898 const struct diff_filespec
*one
,
899 const struct diff_filespec
*a
,
900 const struct diff_filespec
*b
,
903 struct merge_file_info
*result
)
908 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
910 if (S_ISREG(a
->mode
)) {
911 result
->mode
= a
->mode
;
912 oidcpy(&result
->oid
, &a
->oid
);
914 result
->mode
= b
->mode
;
915 oidcpy(&result
->oid
, &b
->oid
);
918 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
924 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
925 result
->mode
= b
->mode
;
927 result
->mode
= a
->mode
;
928 if (b
->mode
!= one
->mode
) {
934 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
935 oidcpy(&result
->oid
, &b
->oid
);
936 else if (oid_eq(&b
->oid
, &one
->oid
))
937 oidcpy(&result
->oid
, &a
->oid
);
938 else if (S_ISREG(a
->mode
)) {
939 mmbuffer_t result_buf
;
942 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
945 if ((merge_status
< 0) || !result_buf
.ptr
)
946 die(_("Failed to execute internal merge"));
948 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
949 blob_type
, result
->oid
.hash
))
950 die(_("Unable to add %s to database"),
953 free(result_buf
.ptr
);
954 result
->clean
= (merge_status
== 0);
955 } else if (S_ISGITLINK(a
->mode
)) {
956 result
->clean
= merge_submodule(result
->oid
.hash
,
962 } else if (S_ISLNK(a
->mode
)) {
963 oidcpy(&result
->oid
, &a
->oid
);
965 if (!oid_eq(&a
->oid
, &b
->oid
))
968 die("BUG: unsupported object type in the tree");
974 static int merge_file_special_markers(struct merge_options
*o
,
975 const struct diff_filespec
*one
,
976 const struct diff_filespec
*a
,
977 const struct diff_filespec
*b
,
979 const char *filename1
,
981 const char *filename2
,
982 struct merge_file_info
*mfi
)
989 side1
= xstrfmt("%s:%s", branch1
, filename1
);
991 side2
= xstrfmt("%s:%s", branch2
, filename2
);
993 ret
= merge_file_1(o
, one
, a
, b
,
994 side1
? side1
: branch1
,
995 side2
? side2
: branch2
, mfi
);
1001 static int merge_file_one(struct merge_options
*o
,
1003 const struct object_id
*o_oid
, int o_mode
,
1004 const struct object_id
*a_oid
, int a_mode
,
1005 const struct object_id
*b_oid
, int b_mode
,
1006 const char *branch1
,
1007 const char *branch2
,
1008 struct merge_file_info
*mfi
)
1010 struct diff_filespec one
, a
, b
;
1012 one
.path
= a
.path
= b
.path
= (char *)path
;
1013 oidcpy(&one
.oid
, o_oid
);
1015 oidcpy(&a
.oid
, a_oid
);
1017 oidcpy(&b
.oid
, b_oid
);
1019 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
, mfi
);
1022 static void handle_change_delete(struct merge_options
*o
,
1024 const struct object_id
*o_oid
, int o_mode
,
1025 const struct object_id
*a_oid
, int a_mode
,
1026 const struct object_id
*b_oid
, int b_mode
,
1027 const char *change
, const char *change_past
)
1029 char *renamed
= NULL
;
1030 if (dir_in_way(path
, !o
->call_depth
)) {
1031 renamed
= unique_path(o
, path
, a_oid
? o
->branch1
: o
->branch2
);
1034 if (o
->call_depth
) {
1036 * We cannot arbitrarily accept either a_sha or b_sha as
1037 * correct; since there is no true "middle point" between
1038 * them, simply reuse the base version for virtual merge base.
1040 remove_file_from_cache(path
);
1041 update_file(o
, 0, o_oid
, o_mode
, renamed
? renamed
: path
);
1042 } else if (!a_oid
) {
1044 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1045 "and %s in %s. Version %s of %s left in tree."),
1046 change
, path
, o
->branch1
, change_past
,
1047 o
->branch2
, o
->branch2
, path
);
1048 update_file(o
, 0, b_oid
, b_mode
, path
);
1050 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1051 "and %s in %s. Version %s of %s left in tree at %s."),
1052 change
, path
, o
->branch1
, change_past
,
1053 o
->branch2
, o
->branch2
, path
, renamed
);
1054 update_file(o
, 0, b_oid
, b_mode
, renamed
);
1058 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1059 "and %s in %s. Version %s of %s left in tree."),
1060 change
, path
, o
->branch2
, change_past
,
1061 o
->branch1
, o
->branch1
, path
);
1063 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1064 "and %s in %s. Version %s of %s left in tree at %s."),
1065 change
, path
, o
->branch2
, change_past
,
1066 o
->branch1
, o
->branch1
, path
, renamed
);
1067 update_file(o
, 0, a_oid
, a_mode
, renamed
);
1070 * No need to call update_file() on path when !renamed, since
1071 * that would needlessly touch path. We could call
1072 * update_file_flags() with update_cache=0 and update_wd=0,
1073 * but that's a no-op.
1079 static void conflict_rename_delete(struct merge_options
*o
,
1080 struct diff_filepair
*pair
,
1081 const char *rename_branch
,
1082 const char *other_branch
)
1084 const struct diff_filespec
*orig
= pair
->one
;
1085 const struct diff_filespec
*dest
= pair
->two
;
1086 const struct object_id
*a_oid
= NULL
;
1087 const struct object_id
*b_oid
= NULL
;
1091 if (rename_branch
== o
->branch1
) {
1093 a_mode
= dest
->mode
;
1096 b_mode
= dest
->mode
;
1099 handle_change_delete(o
,
1100 o
->call_depth
? orig
->path
: dest
->path
,
1101 &orig
->oid
, orig
->mode
,
1104 _("rename"), _("renamed"));
1106 if (o
->call_depth
) {
1107 remove_file_from_cache(dest
->path
);
1109 update_stages(dest
->path
, NULL
,
1110 rename_branch
== o
->branch1
? dest
: NULL
,
1111 rename_branch
== o
->branch1
? NULL
: dest
);
1116 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1117 struct stage_data
*entry
,
1120 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1121 unsigned mode
= entry
->stages
[stage
].mode
;
1122 if (mode
== 0 || is_null_oid(oid
))
1124 oidcpy(&target
->oid
, oid
);
1125 target
->mode
= mode
;
1129 static void handle_file(struct merge_options
*o
,
1130 struct diff_filespec
*rename
,
1132 struct rename_conflict_info
*ci
)
1134 char *dst_name
= rename
->path
;
1135 struct stage_data
*dst_entry
;
1136 const char *cur_branch
, *other_branch
;
1137 struct diff_filespec other
;
1138 struct diff_filespec
*add
;
1141 dst_entry
= ci
->dst_entry1
;
1142 cur_branch
= ci
->branch1
;
1143 other_branch
= ci
->branch2
;
1145 dst_entry
= ci
->dst_entry2
;
1146 cur_branch
= ci
->branch2
;
1147 other_branch
= ci
->branch1
;
1150 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1152 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1153 update_file(o
, 0, &add
->oid
, add
->mode
, add_name
);
1155 remove_file(o
, 0, rename
->path
, 0);
1156 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1158 if (dir_in_way(rename
->path
, !o
->call_depth
)) {
1159 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1160 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1161 rename
->path
, other_branch
, dst_name
);
1164 update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
);
1166 update_stages(rename
->path
, NULL
, rename
, add
);
1168 update_stages(rename
->path
, NULL
, add
, rename
);
1170 if (dst_name
!= rename
->path
)
1174 static void conflict_rename_rename_1to2(struct merge_options
*o
,
1175 struct rename_conflict_info
*ci
)
1177 /* One file was renamed in both branches, but to different names. */
1178 struct diff_filespec
*one
= ci
->pair1
->one
;
1179 struct diff_filespec
*a
= ci
->pair1
->two
;
1180 struct diff_filespec
*b
= ci
->pair2
->two
;
1182 output(o
, 1, _("CONFLICT (rename/rename): "
1183 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1184 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1185 one
->path
, a
->path
, ci
->branch1
,
1186 one
->path
, b
->path
, ci
->branch2
,
1187 o
->call_depth
? _(" (left unresolved)") : "");
1188 if (o
->call_depth
) {
1189 struct merge_file_info mfi
;
1190 struct diff_filespec other
;
1191 struct diff_filespec
*add
;
1192 if (merge_file_one(o
, one
->path
,
1193 &one
->oid
, one
->mode
,
1196 ci
->branch1
, ci
->branch2
, &mfi
))
1199 * FIXME: For rename/add-source conflicts (if we could detect
1200 * such), this is wrong. We should instead find a unique
1201 * pathname and then either rename the add-source file to that
1202 * unique path, or use that unique path instead of src here.
1204 update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
);
1207 * Above, we put the merged content at the merge-base's
1208 * path. Now we usually need to delete both a->path and
1209 * b->path. However, the rename on each side of the merge
1210 * could also be involved in a rename/add conflict. In
1211 * such cases, we should keep the added file around,
1212 * resolving the conflict at that path in its favor.
1214 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1216 update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
);
1218 remove_file_from_cache(a
->path
);
1219 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1221 update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
);
1223 remove_file_from_cache(b
->path
);
1225 handle_file(o
, a
, 2, ci
);
1226 handle_file(o
, b
, 3, ci
);
1230 static void conflict_rename_rename_2to1(struct merge_options
*o
,
1231 struct rename_conflict_info
*ci
)
1233 /* Two files, a & b, were renamed to the same thing, c. */
1234 struct diff_filespec
*a
= ci
->pair1
->one
;
1235 struct diff_filespec
*b
= ci
->pair2
->one
;
1236 struct diff_filespec
*c1
= ci
->pair1
->two
;
1237 struct diff_filespec
*c2
= ci
->pair2
->two
;
1238 char *path
= c1
->path
; /* == c2->path */
1239 struct merge_file_info mfi_c1
;
1240 struct merge_file_info mfi_c2
;
1242 output(o
, 1, _("CONFLICT (rename/rename): "
1243 "Rename %s->%s in %s. "
1244 "Rename %s->%s in %s"),
1245 a
->path
, c1
->path
, ci
->branch1
,
1246 b
->path
, c2
->path
, ci
->branch2
);
1248 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1249 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1251 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1252 o
->branch1
, c1
->path
,
1253 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1254 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1255 o
->branch1
, ci
->ren2_other
.path
,
1256 o
->branch2
, c2
->path
, &mfi_c2
))
1259 if (o
->call_depth
) {
1261 * If mfi_c1.clean && mfi_c2.clean, then it might make
1262 * sense to do a two-way merge of those results. But, I
1263 * think in all cases, it makes sense to have the virtual
1264 * merge base just undo the renames; they can be detected
1265 * again later for the non-recursive merge.
1267 remove_file(o
, 0, path
, 0);
1268 update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1269 update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
, b
->path
);
1271 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1272 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1273 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1274 a
->path
, new_path1
, b
->path
, new_path2
);
1275 remove_file(o
, 0, path
, 0);
1276 update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1277 update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
, new_path2
);
1283 static int process_renames(struct merge_options
*o
,
1284 struct string_list
*a_renames
,
1285 struct string_list
*b_renames
)
1287 int clean_merge
= 1, i
, j
;
1288 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1289 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1290 const struct rename
*sre
;
1292 for (i
= 0; i
< a_renames
->nr
; i
++) {
1293 sre
= a_renames
->items
[i
].util
;
1294 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1297 for (i
= 0; i
< b_renames
->nr
; i
++) {
1298 sre
= b_renames
->items
[i
].util
;
1299 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1303 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1304 struct string_list
*renames1
, *renames2Dst
;
1305 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1306 const char *branch1
, *branch2
;
1307 const char *ren1_src
, *ren1_dst
;
1308 struct string_list_item
*lookup
;
1310 if (i
>= a_renames
->nr
) {
1311 ren2
= b_renames
->items
[j
++].util
;
1312 } else if (j
>= b_renames
->nr
) {
1313 ren1
= a_renames
->items
[i
++].util
;
1315 int compare
= strcmp(a_renames
->items
[i
].string
,
1316 b_renames
->items
[j
].string
);
1318 ren1
= a_renames
->items
[i
++].util
;
1320 ren2
= b_renames
->items
[j
++].util
;
1323 /* TODO: refactor, so that 1/2 are not needed */
1325 renames1
= a_renames
;
1326 renames2Dst
= &b_by_dst
;
1327 branch1
= o
->branch1
;
1328 branch2
= o
->branch2
;
1331 renames1
= b_renames
;
1332 renames2Dst
= &a_by_dst
;
1333 branch1
= o
->branch2
;
1334 branch2
= o
->branch1
;
1340 if (ren1
->processed
)
1342 ren1
->processed
= 1;
1343 ren1
->dst_entry
->processed
= 1;
1344 /* BUG: We should only mark src_entry as processed if we
1345 * are not dealing with a rename + add-source case.
1347 ren1
->src_entry
->processed
= 1;
1349 ren1_src
= ren1
->pair
->one
->path
;
1350 ren1_dst
= ren1
->pair
->two
->path
;
1353 /* One file renamed on both sides */
1354 const char *ren2_src
= ren2
->pair
->one
->path
;
1355 const char *ren2_dst
= ren2
->pair
->two
->path
;
1356 enum rename_type rename_type
;
1357 if (strcmp(ren1_src
, ren2_src
) != 0)
1358 die("BUG: ren1_src != ren2_src");
1359 ren2
->dst_entry
->processed
= 1;
1360 ren2
->processed
= 1;
1361 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1362 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1365 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1366 /* BUG: We should only remove ren1_src in
1367 * the base stage (think of rename +
1368 * add-source cases).
1370 remove_file(o
, 1, ren1_src
, 1);
1371 update_entry(ren1
->dst_entry
,
1376 setup_rename_conflict_info(rename_type
,
1386 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1387 /* Two different files renamed to the same thing */
1389 ren2
= lookup
->util
;
1390 ren2_dst
= ren2
->pair
->two
->path
;
1391 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1392 die("BUG: ren1_dst != ren2_dst");
1395 ren2
->processed
= 1;
1397 * BUG: We should only mark src_entry as processed
1398 * if we are not dealing with a rename + add-source
1401 ren2
->src_entry
->processed
= 1;
1403 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1415 /* Renamed in 1, maybe changed in 2 */
1416 /* we only use sha1 and mode of these */
1417 struct diff_filespec src_other
, dst_other
;
1421 * unpack_trees loads entries from common-commit
1422 * into stage 1, from head-commit into stage 2, and
1423 * from merge-commit into stage 3. We keep track
1424 * of which side corresponds to the rename.
1426 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1427 int other_stage
= a_renames
== renames1
? 3 : 2;
1429 /* BUG: We should only remove ren1_src in the base
1430 * stage and in other_stage (think of rename +
1433 remove_file(o
, 1, ren1_src
,
1434 renamed_stage
== 2 || !was_tracked(ren1_src
));
1436 oidcpy(&src_other
.oid
,
1437 &ren1
->src_entry
->stages
[other_stage
].oid
);
1438 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1439 oidcpy(&dst_other
.oid
,
1440 &ren1
->dst_entry
->stages
[other_stage
].oid
);
1441 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1444 if (oid_eq(&src_other
.oid
, &null_oid
)) {
1445 setup_rename_conflict_info(RENAME_DELETE
,
1455 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1456 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
1458 * Added file on the other side identical to
1459 * the file being renamed: clean merge.
1460 * Also, there is no need to overwrite the
1461 * file already in the working copy, so call
1462 * update_file_flags() instead of
1465 update_file_flags(o
,
1466 &ren1
->pair
->two
->oid
,
1467 ren1
->pair
->two
->mode
,
1469 1, /* update_cache */
1471 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
1474 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1476 ren1_src
, ren1_dst
, branch1
,
1478 if (o
->call_depth
) {
1479 struct merge_file_info mfi
;
1480 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
1481 &ren1
->pair
->two
->oid
,
1482 ren1
->pair
->two
->mode
,
1485 branch1
, branch2
, &mfi
))
1487 output(o
, 1, _("Adding merged %s"), ren1_dst
);
1488 update_file(o
, 0, &mfi
.oid
,
1489 mfi
.mode
, ren1_dst
);
1492 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1493 output(o
, 1, _("Adding as %s instead"), new_path
);
1494 update_file(o
, 0, &dst_other
.oid
,
1495 dst_other
.mode
, new_path
);
1502 struct diff_filespec
*one
, *a
, *b
;
1503 src_other
.path
= (char *)ren1_src
;
1505 one
= ren1
->pair
->one
;
1506 if (a_renames
== renames1
) {
1507 a
= ren1
->pair
->two
;
1510 b
= ren1
->pair
->two
;
1513 update_entry(ren1
->dst_entry
, one
, a
, b
);
1514 setup_rename_conflict_info(RENAME_NORMAL
,
1527 string_list_clear(&a_by_dst
, 0);
1528 string_list_clear(&b_by_dst
, 0);
1533 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
1535 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
1538 static int read_oid_strbuf(const struct object_id
*oid
, struct strbuf
*dst
)
1541 enum object_type type
;
1543 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
1545 return error(_("cannot read object %s"), oid_to_hex(oid
));
1546 if (type
!= OBJ_BLOB
) {
1548 return error(_("object %s is not a blob"), oid_to_hex(oid
));
1550 strbuf_attach(dst
, buf
, size
, size
+ 1);
1554 static int blob_unchanged(const struct object_id
*o_oid
,
1556 const struct object_id
*a_oid
,
1558 int renormalize
, const char *path
)
1560 struct strbuf o
= STRBUF_INIT
;
1561 struct strbuf a
= STRBUF_INIT
;
1562 int ret
= 0; /* assume changed for safety */
1564 if (a_mode
!= o_mode
)
1566 if (oid_eq(o_oid
, a_oid
))
1571 assert(o_oid
&& a_oid
);
1572 if (read_oid_strbuf(o_oid
, &o
) || read_oid_strbuf(a_oid
, &a
))
1575 * Note: binary | is used so that both renormalizations are
1576 * performed. Comparison can be skipped if both files are
1577 * unchanged since their sha1s have already been compared.
1579 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1580 renormalize_buffer(path
, a
.buf
, a
.len
, &a
))
1581 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1589 static void handle_modify_delete(struct merge_options
*o
,
1591 struct object_id
*o_oid
, int o_mode
,
1592 struct object_id
*a_oid
, int a_mode
,
1593 struct object_id
*b_oid
, int b_mode
)
1595 handle_change_delete(o
,
1600 _("modify"), _("modified"));
1603 static int merge_content(struct merge_options
*o
,
1605 struct object_id
*o_oid
, int o_mode
,
1606 struct object_id
*a_oid
, int a_mode
,
1607 struct object_id
*b_oid
, int b_mode
,
1608 struct rename_conflict_info
*rename_conflict_info
)
1610 const char *reason
= _("content");
1611 const char *path1
= NULL
, *path2
= NULL
;
1612 struct merge_file_info mfi
;
1613 struct diff_filespec one
, a
, b
;
1614 unsigned df_conflict_remains
= 0;
1617 reason
= _("add/add");
1618 o_oid
= (struct object_id
*)&null_oid
;
1620 one
.path
= a
.path
= b
.path
= (char *)path
;
1621 oidcpy(&one
.oid
, o_oid
);
1623 oidcpy(&a
.oid
, a_oid
);
1625 oidcpy(&b
.oid
, b_oid
);
1628 if (rename_conflict_info
) {
1629 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1631 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1632 pair1
->two
->path
: pair1
->one
->path
;
1633 /* If rename_conflict_info->pair2 != NULL, we are in
1634 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1637 path2
= (rename_conflict_info
->pair2
||
1638 o
->branch2
== rename_conflict_info
->branch1
) ?
1639 pair1
->two
->path
: pair1
->one
->path
;
1641 if (dir_in_way(path
, !o
->call_depth
))
1642 df_conflict_remains
= 1;
1644 if (merge_file_special_markers(o
, &one
, &a
, &b
,
1646 o
->branch2
, path2
, &mfi
))
1649 if (mfi
.clean
&& !df_conflict_remains
&&
1650 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
1651 int path_renamed_outside_HEAD
;
1652 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
1654 * The content merge resulted in the same file contents we
1655 * already had. We can return early if those file contents
1656 * are recorded at the correct path (which may not be true
1657 * if the merge involves a rename).
1659 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1660 if (!path_renamed_outside_HEAD
) {
1661 add_cacheinfo(mfi
.mode
, &mfi
.oid
, path
,
1662 0, (!o
->call_depth
), 0);
1666 output(o
, 2, _("Auto-merging %s"), path
);
1669 if (S_ISGITLINK(mfi
.mode
))
1670 reason
= _("submodule");
1671 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
1673 if (rename_conflict_info
&& !df_conflict_remains
)
1674 update_stages(path
, &one
, &a
, &b
);
1677 if (df_conflict_remains
) {
1679 if (o
->call_depth
) {
1680 remove_file_from_cache(path
);
1683 update_stages(path
, &one
, &a
, &b
);
1685 int file_from_stage2
= was_tracked(path
);
1686 struct diff_filespec merged
;
1687 oidcpy(&merged
.oid
, &mfi
.oid
);
1688 merged
.mode
= mfi
.mode
;
1690 update_stages(path
, NULL
,
1691 file_from_stage2
? &merged
: NULL
,
1692 file_from_stage2
? NULL
: &merged
);
1696 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1697 output(o
, 1, _("Adding as %s instead"), new_path
);
1698 update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
);
1702 update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
);
1708 /* Per entry merge function */
1709 static int process_entry(struct merge_options
*o
,
1710 const char *path
, struct stage_data
*entry
)
1712 int clean_merge
= 1;
1713 int normalize
= o
->renormalize
;
1714 unsigned o_mode
= entry
->stages
[1].mode
;
1715 unsigned a_mode
= entry
->stages
[2].mode
;
1716 unsigned b_mode
= entry
->stages
[3].mode
;
1717 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
1718 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
1719 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
1721 entry
->processed
= 1;
1722 if (entry
->rename_conflict_info
) {
1723 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1724 switch (conflict_info
->rename_type
) {
1726 case RENAME_ONE_FILE_TO_ONE
:
1727 clean_merge
= merge_content(o
, path
,
1728 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1733 conflict_rename_delete(o
, conflict_info
->pair1
,
1734 conflict_info
->branch1
,
1735 conflict_info
->branch2
);
1737 case RENAME_ONE_FILE_TO_TWO
:
1739 conflict_rename_rename_1to2(o
, conflict_info
);
1741 case RENAME_TWO_FILES_TO_ONE
:
1743 conflict_rename_rename_2to1(o
, conflict_info
);
1746 entry
->processed
= 0;
1749 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
1750 /* Case A: Deleted in one */
1751 if ((!a_oid
&& !b_oid
) ||
1752 (!b_oid
&& blob_unchanged(o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
1753 (!a_oid
&& blob_unchanged(o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
1754 /* Deleted in both or deleted in one and
1755 * unchanged in the other */
1757 output(o
, 2, _("Removing %s"), path
);
1758 /* do not touch working file if it did not exist */
1759 remove_file(o
, 1, path
, !a_oid
);
1761 /* Modify/delete; deleted side may have put a directory in the way */
1763 handle_modify_delete(o
, path
, o_oid
, o_mode
,
1764 a_oid
, a_mode
, b_oid
, b_mode
);
1766 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
1767 (!o_oid
&& !a_oid
&& b_oid
)) {
1768 /* Case B: Added in one. */
1769 /* [nothing|directory] -> ([nothing|directory], file) */
1771 const char *add_branch
;
1772 const char *other_branch
;
1774 const struct object_id
*oid
;
1778 add_branch
= o
->branch1
;
1779 other_branch
= o
->branch2
;
1782 conf
= _("file/directory");
1784 add_branch
= o
->branch2
;
1785 other_branch
= o
->branch1
;
1788 conf
= _("directory/file");
1790 if (dir_in_way(path
, !o
->call_depth
)) {
1791 char *new_path
= unique_path(o
, path
, add_branch
);
1793 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1795 conf
, path
, other_branch
, path
, new_path
);
1796 update_file(o
, 0, oid
, mode
, new_path
);
1798 remove_file_from_cache(path
);
1801 output(o
, 2, _("Adding %s"), path
);
1802 /* do not overwrite file if already present */
1803 update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
);
1805 } else if (a_oid
&& b_oid
) {
1806 /* Case C: Added in both (check for same permissions) and */
1807 /* case D: Modified in both, but differently. */
1808 clean_merge
= merge_content(o
, path
,
1809 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1811 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
1813 * this entry was deleted altogether. a_mode == 0 means
1814 * we had that path and want to actively remove it.
1816 remove_file(o
, 1, path
, !a_mode
);
1818 die("BUG: fatal merge failure, shouldn't happen.");
1823 int merge_trees(struct merge_options
*o
,
1826 struct tree
*common
,
1827 struct tree
**result
)
1831 if (o
->subtree_shift
) {
1832 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1833 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1836 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
1837 output(o
, 0, _("Already up-to-date!"));
1842 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1845 if (show(o
, 4) || o
->call_depth
)
1846 die(_("merging of trees %s and %s failed"),
1847 oid_to_hex(&head
->object
.oid
),
1848 oid_to_hex(&merge
->object
.oid
));
1853 if (unmerged_cache()) {
1854 struct string_list
*entries
, *re_head
, *re_merge
;
1856 string_list_clear(&o
->current_file_set
, 1);
1857 string_list_clear(&o
->current_directory_set
, 1);
1858 get_files_dirs(o
, head
);
1859 get_files_dirs(o
, merge
);
1861 entries
= get_unmerged();
1862 record_df_conflict_files(o
, entries
);
1863 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1864 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1865 clean
= process_renames(o
, re_head
, re_merge
);
1866 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
1867 const char *path
= entries
->items
[i
].string
;
1868 struct stage_data
*e
= entries
->items
[i
].util
;
1870 && !process_entry(o
, path
, e
))
1873 for (i
= 0; i
< entries
->nr
; i
++) {
1874 struct stage_data
*e
= entries
->items
[i
].util
;
1876 die("BUG: unprocessed path??? %s",
1877 entries
->items
[i
].string
);
1880 string_list_clear(re_merge
, 0);
1881 string_list_clear(re_head
, 0);
1882 string_list_clear(entries
, 1);
1891 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
1897 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1899 struct commit_list
*next
= NULL
, *current
, *backup
;
1900 for (current
= list
; current
; current
= backup
) {
1901 backup
= current
->next
;
1902 current
->next
= next
;
1909 * Merge the commits h1 and h2, return the resulting virtual
1910 * commit object and a flag indicating the cleanness of the merge.
1912 int merge_recursive(struct merge_options
*o
,
1915 struct commit_list
*ca
,
1916 struct commit
**result
)
1918 struct commit_list
*iter
;
1919 struct commit
*merged_common_ancestors
;
1920 struct tree
*mrtree
= mrtree
;
1924 output(o
, 4, _("Merging:"));
1925 output_commit_title(o
, h1
);
1926 output_commit_title(o
, h2
);
1930 ca
= get_merge_bases(h1
, h2
);
1931 ca
= reverse_commit_list(ca
);
1935 unsigned cnt
= commit_list_count(ca
);
1937 output(o
, 5, Q_("found %u common ancestor:",
1938 "found %u common ancestors:", cnt
), cnt
);
1939 for (iter
= ca
; iter
; iter
= iter
->next
)
1940 output_commit_title(o
, iter
->item
);
1943 merged_common_ancestors
= pop_commit(&ca
);
1944 if (merged_common_ancestors
== NULL
) {
1945 /* if there is no common ancestor, use an empty tree */
1948 tree
= lookup_tree(EMPTY_TREE_SHA1_BIN
);
1949 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1952 for (iter
= ca
; iter
; iter
= iter
->next
) {
1953 const char *saved_b1
, *saved_b2
;
1956 * When the merge fails, the result contains files
1957 * with conflict markers. The cleanness flag is
1958 * ignored (unless indicating an error), it was never
1959 * actually used, as result of merge_trees has always
1960 * overwritten it: the committed "conflicts" were
1964 saved_b1
= o
->branch1
;
1965 saved_b2
= o
->branch2
;
1966 o
->branch1
= "Temporary merge branch 1";
1967 o
->branch2
= "Temporary merge branch 2";
1968 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1969 NULL
, &merged_common_ancestors
) < 0)
1971 o
->branch1
= saved_b1
;
1972 o
->branch2
= saved_b2
;
1975 if (!merged_common_ancestors
)
1976 die(_("merge returned no commit"));
1983 o
->ancestor
= "merged common ancestors";
1984 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1989 if (o
->call_depth
) {
1990 *result
= make_virtual_commit(mrtree
, "merged tree");
1991 commit_list_insert(h1
, &(*result
)->parents
);
1992 commit_list_insert(h2
, &(*result
)->parents
->next
);
1996 diff_warn_rename_limit("merge.renamelimit",
1997 o
->needed_rename_limit
, 0);
2001 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
2003 struct object
*object
;
2005 object
= deref_tag(parse_object(oid
->hash
), name
, strlen(name
));
2008 if (object
->type
== OBJ_TREE
)
2009 return make_virtual_commit((struct tree
*)object
, name
);
2010 if (object
->type
!= OBJ_COMMIT
)
2012 if (parse_commit((struct commit
*)object
))
2014 return (struct commit
*)object
;
2017 int merge_recursive_generic(struct merge_options
*o
,
2018 const struct object_id
*head
,
2019 const struct object_id
*merge
,
2021 const struct object_id
**base_list
,
2022 struct commit
**result
)
2025 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
2026 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
2027 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
2028 struct commit_list
*ca
= NULL
;
2032 for (i
= 0; i
< num_base_list
; ++i
) {
2033 struct commit
*base
;
2034 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
2035 return error(_("Could not parse object '%s'"),
2036 oid_to_hex(base_list
[i
]));
2037 commit_list_insert(base
, &ca
);
2041 hold_locked_index(lock
, 1);
2042 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
2047 if (active_cache_changed
&&
2048 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
2049 return error(_("Unable to write index."));
2051 return clean
? 0 : 1;
2054 static void merge_recursive_config(struct merge_options
*o
)
2056 git_config_get_int("merge.verbosity", &o
->verbosity
);
2057 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
2058 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
2059 git_config(git_xmerge_config
, NULL
);
2062 void init_merge_options(struct merge_options
*o
)
2064 memset(o
, 0, sizeof(struct merge_options
));
2066 o
->buffer_output
= 1;
2067 o
->diff_rename_limit
= -1;
2068 o
->merge_rename_limit
= -1;
2070 o
->detect_rename
= 1;
2071 merge_recursive_config(o
);
2072 if (getenv("GIT_MERGE_VERBOSITY"))
2074 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
2075 if (o
->verbosity
>= 5)
2076 o
->buffer_output
= 0;
2077 strbuf_init(&o
->obuf
, 0);
2078 string_list_init(&o
->current_file_set
, 1);
2079 string_list_init(&o
->current_directory_set
, 1);
2080 string_list_init(&o
->df_conflict_file_set
, 1);
2083 int parse_merge_opt(struct merge_options
*o
, const char *s
)
2089 if (!strcmp(s
, "ours"))
2090 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
2091 else if (!strcmp(s
, "theirs"))
2092 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
2093 else if (!strcmp(s
, "subtree"))
2094 o
->subtree_shift
= "";
2095 else if (skip_prefix(s
, "subtree=", &arg
))
2096 o
->subtree_shift
= arg
;
2097 else if (!strcmp(s
, "patience"))
2098 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
2099 else if (!strcmp(s
, "histogram"))
2100 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
2101 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
2102 long value
= parse_algorithm_value(arg
);
2105 /* clear out previous settings */
2106 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
2107 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
2108 o
->xdl_opts
|= value
;
2110 else if (!strcmp(s
, "ignore-space-change"))
2111 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2112 else if (!strcmp(s
, "ignore-all-space"))
2113 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2114 else if (!strcmp(s
, "ignore-space-at-eol"))
2115 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2116 else if (!strcmp(s
, "renormalize"))
2118 else if (!strcmp(s
, "no-renormalize"))
2120 else if (!strcmp(s
, "no-renames"))
2121 o
->detect_rename
= 0;
2122 else if (!strcmp(s
, "find-renames")) {
2123 o
->detect_rename
= 1;
2124 o
->rename_score
= 0;
2126 else if (skip_prefix(s
, "find-renames=", &arg
) ||
2127 skip_prefix(s
, "rename-threshold=", &arg
)) {
2128 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
2130 o
->detect_rename
= 1;