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
;
205 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
,
206 (refresh
? (CE_MATCH_REFRESH
|
207 CE_MATCH_IGNORE_MISSING
) : 0 ));
209 return error(_("addinfo_cache failed for path '%s'"), path
);
210 return add_cache_entry(ce
, options
);
213 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
216 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
219 static int git_merge_trees(int index_only
,
225 struct tree_desc t
[3];
226 struct unpack_trees_options opts
;
228 memset(&opts
, 0, sizeof(opts
));
235 opts
.fn
= threeway_merge
;
236 opts
.src_index
= &the_index
;
237 opts
.dst_index
= &the_index
;
238 setup_unpack_trees_porcelain(&opts
, "merge");
240 init_tree_desc_from_tree(t
+0, common
);
241 init_tree_desc_from_tree(t
+1, head
);
242 init_tree_desc_from_tree(t
+2, merge
);
244 rc
= unpack_trees(3, t
, &opts
);
245 cache_tree_free(&active_cache_tree
);
249 struct tree
*write_tree_from_memory(struct merge_options
*o
)
251 struct tree
*result
= NULL
;
253 if (unmerged_cache()) {
255 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
256 for (i
= 0; i
< active_nr
; i
++) {
257 const struct cache_entry
*ce
= active_cache
[i
];
259 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
260 (int)ce_namelen(ce
), ce
->name
);
262 die("Bug in merge-recursive.c");
265 if (!active_cache_tree
)
266 active_cache_tree
= cache_tree();
268 if (!cache_tree_fully_valid(active_cache_tree
) &&
269 cache_tree_update(&the_index
, 0) < 0)
270 die(_("error building trees"));
272 result
= lookup_tree(active_cache_tree
->sha1
);
277 static int save_files_dirs(const unsigned char *sha1
,
278 struct strbuf
*base
, const char *path
,
279 unsigned int mode
, int stage
, void *context
)
281 int baselen
= base
->len
;
282 struct merge_options
*o
= context
;
284 strbuf_addstr(base
, path
);
287 string_list_insert(&o
->current_directory_set
, base
->buf
);
289 string_list_insert(&o
->current_file_set
, base
->buf
);
291 strbuf_setlen(base
, baselen
);
292 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
295 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
298 struct pathspec match_all
;
299 memset(&match_all
, 0, sizeof(match_all
));
300 if (read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
))
302 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
307 * Returns an index_entry instance which doesn't have to correspond to
308 * a real cache entry in Git's index.
310 static struct stage_data
*insert_stage_data(const char *path
,
311 struct tree
*o
, struct tree
*a
, struct tree
*b
,
312 struct string_list
*entries
)
314 struct string_list_item
*item
;
315 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
316 get_tree_entry(o
->object
.oid
.hash
, path
,
317 e
->stages
[1].oid
.hash
, &e
->stages
[1].mode
);
318 get_tree_entry(a
->object
.oid
.hash
, path
,
319 e
->stages
[2].oid
.hash
, &e
->stages
[2].mode
);
320 get_tree_entry(b
->object
.oid
.hash
, path
,
321 e
->stages
[3].oid
.hash
, &e
->stages
[3].mode
);
322 item
= string_list_insert(entries
, path
);
328 * Create a dictionary mapping file names to stage_data objects. The
329 * dictionary contains one entry for every path with a non-zero stage entry.
331 static struct string_list
*get_unmerged(void)
333 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
336 unmerged
->strdup_strings
= 1;
338 for (i
= 0; i
< active_nr
; i
++) {
339 struct string_list_item
*item
;
340 struct stage_data
*e
;
341 const struct cache_entry
*ce
= active_cache
[i
];
345 item
= string_list_lookup(unmerged
, ce
->name
);
347 item
= string_list_insert(unmerged
, ce
->name
);
348 item
->util
= xcalloc(1, sizeof(struct stage_data
));
351 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
352 hashcpy(e
->stages
[ce_stage(ce
)].oid
.hash
, ce
->sha1
);
358 static int string_list_df_name_compare(const void *a
, const void *b
)
360 const struct string_list_item
*one
= a
;
361 const struct string_list_item
*two
= b
;
362 int onelen
= strlen(one
->string
);
363 int twolen
= strlen(two
->string
);
365 * Here we only care that entries for D/F conflicts are
366 * adjacent, in particular with the file of the D/F conflict
367 * appearing before files below the corresponding directory.
368 * The order of the rest of the list is irrelevant for us.
370 * To achieve this, we sort with df_name_compare and provide
371 * the mode S_IFDIR so that D/F conflicts will sort correctly.
372 * We use the mode S_IFDIR for everything else for simplicity,
373 * since in other cases any changes in their order due to
374 * sorting cause no problems for us.
376 int cmp
= df_name_compare(one
->string
, onelen
, S_IFDIR
,
377 two
->string
, twolen
, S_IFDIR
);
379 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
380 * that 'foo' comes before 'foo/bar'.
384 return onelen
- twolen
;
387 static void record_df_conflict_files(struct merge_options
*o
,
388 struct string_list
*entries
)
390 /* If there is a D/F conflict and the file for such a conflict
391 * currently exist in the working tree, we want to allow it to be
392 * removed to make room for the corresponding directory if needed.
393 * The files underneath the directories of such D/F conflicts will
394 * be processed before the corresponding file involved in the D/F
395 * conflict. If the D/F directory ends up being removed by the
396 * merge, then we won't have to touch the D/F file. If the D/F
397 * directory needs to be written to the working copy, then the D/F
398 * file will simply be removed (in make_room_for_path()) to make
399 * room for the necessary paths. Note that if both the directory
400 * and the file need to be present, then the D/F file will be
401 * reinstated with a new unique name at the time it is processed.
403 struct string_list df_sorted_entries
;
404 const char *last_file
= NULL
;
409 * If we're merging merge-bases, we don't want to bother with
410 * any working directory changes.
415 /* Ensure D/F conflicts are adjacent in the entries list. */
416 memset(&df_sorted_entries
, 0, sizeof(struct string_list
));
417 for (i
= 0; i
< entries
->nr
; i
++) {
418 struct string_list_item
*next
= &entries
->items
[i
];
419 string_list_append(&df_sorted_entries
, next
->string
)->util
=
422 qsort(df_sorted_entries
.items
, entries
->nr
, sizeof(*entries
->items
),
423 string_list_df_name_compare
);
425 string_list_clear(&o
->df_conflict_file_set
, 1);
426 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
427 const char *path
= df_sorted_entries
.items
[i
].string
;
428 int len
= strlen(path
);
429 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
432 * Check if last_file & path correspond to a D/F conflict;
433 * i.e. whether path is last_file+'/'+<something>.
434 * If so, record that it's okay to remove last_file to make
435 * room for path and friends if needed.
439 memcmp(path
, last_file
, last_len
) == 0 &&
440 path
[last_len
] == '/') {
441 string_list_insert(&o
->df_conflict_file_set
, last_file
);
445 * Determine whether path could exist as a file in the
446 * working directory as a possible D/F conflict. This
447 * will only occur when it exists in stage 2 as a
450 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
457 string_list_clear(&df_sorted_entries
, 0);
461 struct diff_filepair
*pair
;
462 struct stage_data
*src_entry
;
463 struct stage_data
*dst_entry
;
464 unsigned processed
:1;
468 * Get information of all renames which occurred between 'o_tree' and
469 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
470 * 'b_tree') to be able to associate the correct cache entries with
471 * the rename information. 'tree' is always equal to either a_tree or b_tree.
473 static struct string_list
*get_renames(struct merge_options
*o
,
478 struct string_list
*entries
)
481 struct string_list
*renames
;
482 struct diff_options opts
;
484 renames
= xcalloc(1, sizeof(struct string_list
));
485 if (!o
->detect_rename
)
489 DIFF_OPT_SET(&opts
, RECURSIVE
);
490 DIFF_OPT_CLR(&opts
, RENAME_EMPTY
);
491 opts
.detect_rename
= DIFF_DETECT_RENAME
;
492 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
493 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
495 opts
.rename_score
= o
->rename_score
;
496 opts
.show_rename_progress
= o
->show_rename_progress
;
497 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
498 diff_setup_done(&opts
);
499 diff_tree_sha1(o_tree
->object
.oid
.hash
, tree
->object
.oid
.hash
, "", &opts
);
501 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
502 o
->needed_rename_limit
= opts
.needed_rename_limit
;
503 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
504 struct string_list_item
*item
;
506 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
507 if (pair
->status
!= 'R') {
508 diff_free_filepair(pair
);
511 re
= xmalloc(sizeof(*re
));
514 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
516 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
517 o_tree
, a_tree
, b_tree
, entries
);
519 re
->src_entry
= item
->util
;
521 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
523 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
524 o_tree
, a_tree
, b_tree
, entries
);
526 re
->dst_entry
= item
->util
;
527 item
= string_list_insert(renames
, pair
->one
->path
);
530 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
531 diff_queued_diff
.nr
= 0;
536 static int update_stages(const char *path
, const struct diff_filespec
*o
,
537 const struct diff_filespec
*a
,
538 const struct diff_filespec
*b
)
542 * NOTE: It is usually a bad idea to call update_stages on a path
543 * before calling update_file on that same path, since it can
544 * sometimes lead to spurious "refusing to lose untracked file..."
545 * messages from update_file (via make_room_for path via
546 * would_lose_untracked). Instead, reverse the order of the calls
547 * (executing update_file first and then update_stages).
550 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
552 if (remove_file_from_cache(path
))
555 if (add_cacheinfo(o
->mode
, &o
->oid
, path
, 1, 0, options
))
558 if (add_cacheinfo(a
->mode
, &a
->oid
, path
, 2, 0, options
))
561 if (add_cacheinfo(b
->mode
, &b
->oid
, path
, 3, 0, options
))
566 static void update_entry(struct stage_data
*entry
,
567 struct diff_filespec
*o
,
568 struct diff_filespec
*a
,
569 struct diff_filespec
*b
)
571 entry
->processed
= 0;
572 entry
->stages
[1].mode
= o
->mode
;
573 entry
->stages
[2].mode
= a
->mode
;
574 entry
->stages
[3].mode
= b
->mode
;
575 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
576 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
577 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
580 static int remove_file(struct merge_options
*o
, int clean
,
581 const char *path
, int no_wd
)
583 int update_cache
= o
->call_depth
|| clean
;
584 int update_working_directory
= !o
->call_depth
&& !no_wd
;
587 if (remove_file_from_cache(path
))
590 if (update_working_directory
) {
592 struct cache_entry
*ce
;
593 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
594 if (ce
&& ce_stage(ce
) == 0)
597 if (remove_path(path
))
603 /* add a string to a strbuf, but converting "/" to "_" */
604 static void add_flattened_path(struct strbuf
*out
, const char *s
)
607 strbuf_addstr(out
, s
);
608 for (; i
< out
->len
; i
++)
609 if (out
->buf
[i
] == '/')
613 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
615 struct strbuf newpath
= STRBUF_INIT
;
619 strbuf_addf(&newpath
, "%s~", path
);
620 add_flattened_path(&newpath
, branch
);
622 base_len
= newpath
.len
;
623 while (string_list_has_string(&o
->current_file_set
, newpath
.buf
) ||
624 string_list_has_string(&o
->current_directory_set
, newpath
.buf
) ||
625 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
626 strbuf_setlen(&newpath
, base_len
);
627 strbuf_addf(&newpath
, "_%d", suffix
++);
630 string_list_insert(&o
->current_file_set
, newpath
.buf
);
631 return strbuf_detach(&newpath
, NULL
);
634 static int dir_in_way(const char *path
, int check_working_copy
)
637 struct strbuf dirpath
= STRBUF_INIT
;
640 strbuf_addstr(&dirpath
, path
);
641 strbuf_addch(&dirpath
, '/');
643 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
647 if (pos
< active_nr
&&
648 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
649 strbuf_release(&dirpath
);
653 strbuf_release(&dirpath
);
654 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
657 static int was_tracked(const char *path
)
659 int pos
= cache_name_pos(path
, strlen(path
));
663 while (pos
< active_nr
&&
664 !strcmp(path
, active_cache
[pos
]->name
)) {
666 * If stage #0, it is definitely tracked.
667 * If it has stage #2 then it was tracked
668 * before this merge started. All other
669 * cases the path was not tracked.
671 switch (ce_stage(active_cache
[pos
])) {
681 static int would_lose_untracked(const char *path
)
683 return !was_tracked(path
) && file_exists(path
);
686 static int make_room_for_path(struct merge_options
*o
, const char *path
)
689 const char *msg
= _("failed to create path '%s'%s");
691 /* Unlink any D/F conflict files that are in the way */
692 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
693 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
694 size_t pathlen
= strlen(path
);
695 size_t df_pathlen
= strlen(df_path
);
696 if (df_pathlen
< pathlen
&&
697 path
[df_pathlen
] == '/' &&
698 strncmp(path
, df_path
, df_pathlen
) == 0) {
700 _("Removing %s to make room for subdirectory\n"),
703 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
709 /* Make sure leading directories are created */
710 status
= safe_create_leading_directories_const(path
);
712 if (status
== SCLD_EXISTS
) {
713 /* something else exists */
714 error(msg
, path
, _(": perhaps a D/F conflict?"));
721 * Do not unlink a file in the work tree if we are not
724 if (would_lose_untracked(path
))
725 return error(_("refusing to lose untracked file at '%s'"),
728 /* Successful unlink is good.. */
731 /* .. and so is no existing file */
734 /* .. but not some other error (who really cares what?) */
735 return error(msg
, path
, _(": perhaps a D/F conflict?"));
738 static void update_file_flags(struct merge_options
*o
,
739 const struct object_id
*oid
,
749 enum object_type type
;
753 if (S_ISGITLINK(mode
)) {
755 * We may later decide to recursively descend into
756 * the submodule directory and update its index
757 * and/or work tree, but we do not do that now.
763 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
765 die(_("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
766 if (type
!= OBJ_BLOB
)
767 die(_("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
769 struct strbuf strbuf
= STRBUF_INIT
;
770 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
773 buf
= strbuf_detach(&strbuf
, NULL
);
777 if (make_room_for_path(o
, path
) < 0) {
782 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
788 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
790 die_errno(_("failed to open '%s'"), path
);
791 write_in_full(fd
, buf
, size
);
793 } else if (S_ISLNK(mode
)) {
794 char *lnk
= xmemdupz(buf
, size
);
795 safe_create_leading_directories_const(path
);
797 if (symlink(lnk
, path
))
798 die_errno(_("failed to symlink '%s'"), path
);
801 die(_("do not know what to do with %06o %s '%s'"),
802 mode
, oid_to_hex(oid
), path
);
807 add_cacheinfo(mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
810 static void update_file(struct merge_options
*o
,
812 const struct object_id
*oid
,
816 update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
819 /* Low level file merging, update and removal */
821 struct merge_file_info
{
822 struct object_id oid
;
828 static int merge_3way(struct merge_options
*o
,
829 mmbuffer_t
*result_buf
,
830 const struct diff_filespec
*one
,
831 const struct diff_filespec
*a
,
832 const struct diff_filespec
*b
,
836 mmfile_t orig
, src1
, src2
;
837 struct ll_merge_options ll_opts
= {0};
838 char *base_name
, *name1
, *name2
;
841 ll_opts
.renormalize
= o
->renormalize
;
842 ll_opts
.xdl_opts
= o
->xdl_opts
;
845 ll_opts
.virtual_ancestor
= 1;
848 switch (o
->recursive_variant
) {
849 case MERGE_RECURSIVE_OURS
:
850 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
852 case MERGE_RECURSIVE_THEIRS
:
853 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
861 if (strcmp(a
->path
, b
->path
) ||
862 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
863 base_name
= o
->ancestor
== NULL
? NULL
:
864 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
865 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
866 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
868 base_name
= o
->ancestor
== NULL
? NULL
:
869 mkpathdup("%s", o
->ancestor
);
870 name1
= mkpathdup("%s", branch1
);
871 name2
= mkpathdup("%s", branch2
);
874 read_mmblob(&orig
, one
->oid
.hash
);
875 read_mmblob(&src1
, a
->oid
.hash
);
876 read_mmblob(&src2
, b
->oid
.hash
);
878 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
879 &src1
, name1
, &src2
, name2
, &ll_opts
);
890 static struct merge_file_info
merge_file_1(struct merge_options
*o
,
891 const struct diff_filespec
*one
,
892 const struct diff_filespec
*a
,
893 const struct diff_filespec
*b
,
897 struct merge_file_info result
;
901 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
903 if (S_ISREG(a
->mode
)) {
904 result
.mode
= a
->mode
;
905 oidcpy(&result
.oid
, &a
->oid
);
907 result
.mode
= b
->mode
;
908 oidcpy(&result
.oid
, &b
->oid
);
911 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
917 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
918 result
.mode
= b
->mode
;
920 result
.mode
= a
->mode
;
921 if (b
->mode
!= one
->mode
) {
927 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
928 oidcpy(&result
.oid
, &b
->oid
);
929 else if (oid_eq(&b
->oid
, &one
->oid
))
930 oidcpy(&result
.oid
, &a
->oid
);
931 else if (S_ISREG(a
->mode
)) {
932 mmbuffer_t result_buf
;
935 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
938 if ((merge_status
< 0) || !result_buf
.ptr
)
939 die(_("Failed to execute internal merge"));
941 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
942 blob_type
, result
.oid
.hash
))
943 die(_("Unable to add %s to database"),
946 free(result_buf
.ptr
);
947 result
.clean
= (merge_status
== 0);
948 } else if (S_ISGITLINK(a
->mode
)) {
949 result
.clean
= merge_submodule(result
.oid
.hash
,
955 } else if (S_ISLNK(a
->mode
)) {
956 oidcpy(&result
.oid
, &a
->oid
);
958 if (!oid_eq(&a
->oid
, &b
->oid
))
961 die(_("unsupported object type in the tree"));
968 static struct merge_file_info
969 merge_file_special_markers(struct merge_options
*o
,
970 const struct diff_filespec
*one
,
971 const struct diff_filespec
*a
,
972 const struct diff_filespec
*b
,
974 const char *filename1
,
976 const char *filename2
)
980 struct merge_file_info mfi
;
983 side1
= xstrfmt("%s:%s", branch1
, filename1
);
985 side2
= xstrfmt("%s:%s", branch2
, filename2
);
987 mfi
= merge_file_1(o
, one
, a
, b
,
988 side1
? side1
: branch1
, side2
? side2
: branch2
);
994 static struct merge_file_info
merge_file_one(struct merge_options
*o
,
996 const struct object_id
*o_oid
, int o_mode
,
997 const struct object_id
*a_oid
, int a_mode
,
998 const struct object_id
*b_oid
, int b_mode
,
1000 const char *branch2
)
1002 struct diff_filespec one
, a
, b
;
1004 one
.path
= a
.path
= b
.path
= (char *)path
;
1005 oidcpy(&one
.oid
, o_oid
);
1007 oidcpy(&a
.oid
, a_oid
);
1009 oidcpy(&b
.oid
, b_oid
);
1011 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
);
1014 static void handle_change_delete(struct merge_options
*o
,
1016 const struct object_id
*o_oid
, int o_mode
,
1017 const struct object_id
*a_oid
, int a_mode
,
1018 const struct object_id
*b_oid
, int b_mode
,
1019 const char *change
, const char *change_past
)
1021 char *renamed
= NULL
;
1022 if (dir_in_way(path
, !o
->call_depth
)) {
1023 renamed
= unique_path(o
, path
, a_oid
? o
->branch1
: o
->branch2
);
1026 if (o
->call_depth
) {
1028 * We cannot arbitrarily accept either a_sha or b_sha as
1029 * correct; since there is no true "middle point" between
1030 * them, simply reuse the base version for virtual merge base.
1032 remove_file_from_cache(path
);
1033 update_file(o
, 0, o_oid
, o_mode
, renamed
? renamed
: path
);
1034 } else if (!a_oid
) {
1036 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1037 "and %s in %s. Version %s of %s left in tree."),
1038 change
, path
, o
->branch1
, change_past
,
1039 o
->branch2
, o
->branch2
, path
);
1040 update_file(o
, 0, b_oid
, b_mode
, path
);
1042 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1043 "and %s in %s. Version %s of %s left in tree at %s."),
1044 change
, path
, o
->branch1
, change_past
,
1045 o
->branch2
, o
->branch2
, path
, renamed
);
1046 update_file(o
, 0, b_oid
, b_mode
, renamed
);
1050 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1051 "and %s in %s. Version %s of %s left in tree."),
1052 change
, path
, o
->branch2
, change_past
,
1053 o
->branch1
, o
->branch1
, path
);
1055 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1056 "and %s in %s. Version %s of %s left in tree at %s."),
1057 change
, path
, o
->branch2
, change_past
,
1058 o
->branch1
, o
->branch1
, path
, renamed
);
1059 update_file(o
, 0, a_oid
, a_mode
, renamed
);
1062 * No need to call update_file() on path when !renamed, since
1063 * that would needlessly touch path. We could call
1064 * update_file_flags() with update_cache=0 and update_wd=0,
1065 * but that's a no-op.
1071 static void conflict_rename_delete(struct merge_options
*o
,
1072 struct diff_filepair
*pair
,
1073 const char *rename_branch
,
1074 const char *other_branch
)
1076 const struct diff_filespec
*orig
= pair
->one
;
1077 const struct diff_filespec
*dest
= pair
->two
;
1078 const struct object_id
*a_oid
= NULL
;
1079 const struct object_id
*b_oid
= NULL
;
1083 if (rename_branch
== o
->branch1
) {
1085 a_mode
= dest
->mode
;
1088 b_mode
= dest
->mode
;
1091 handle_change_delete(o
,
1092 o
->call_depth
? orig
->path
: dest
->path
,
1093 &orig
->oid
, orig
->mode
,
1096 _("rename"), _("renamed"));
1098 if (o
->call_depth
) {
1099 remove_file_from_cache(dest
->path
);
1101 update_stages(dest
->path
, NULL
,
1102 rename_branch
== o
->branch1
? dest
: NULL
,
1103 rename_branch
== o
->branch1
? NULL
: dest
);
1108 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1109 struct stage_data
*entry
,
1112 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1113 unsigned mode
= entry
->stages
[stage
].mode
;
1114 if (mode
== 0 || is_null_oid(oid
))
1116 oidcpy(&target
->oid
, oid
);
1117 target
->mode
= mode
;
1121 static void handle_file(struct merge_options
*o
,
1122 struct diff_filespec
*rename
,
1124 struct rename_conflict_info
*ci
)
1126 char *dst_name
= rename
->path
;
1127 struct stage_data
*dst_entry
;
1128 const char *cur_branch
, *other_branch
;
1129 struct diff_filespec other
;
1130 struct diff_filespec
*add
;
1133 dst_entry
= ci
->dst_entry1
;
1134 cur_branch
= ci
->branch1
;
1135 other_branch
= ci
->branch2
;
1137 dst_entry
= ci
->dst_entry2
;
1138 cur_branch
= ci
->branch2
;
1139 other_branch
= ci
->branch1
;
1142 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1144 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1145 update_file(o
, 0, &add
->oid
, add
->mode
, add_name
);
1147 remove_file(o
, 0, rename
->path
, 0);
1148 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1150 if (dir_in_way(rename
->path
, !o
->call_depth
)) {
1151 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1152 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1153 rename
->path
, other_branch
, dst_name
);
1156 update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
);
1158 update_stages(rename
->path
, NULL
, rename
, add
);
1160 update_stages(rename
->path
, NULL
, add
, rename
);
1162 if (dst_name
!= rename
->path
)
1166 static void conflict_rename_rename_1to2(struct merge_options
*o
,
1167 struct rename_conflict_info
*ci
)
1169 /* One file was renamed in both branches, but to different names. */
1170 struct diff_filespec
*one
= ci
->pair1
->one
;
1171 struct diff_filespec
*a
= ci
->pair1
->two
;
1172 struct diff_filespec
*b
= ci
->pair2
->two
;
1174 output(o
, 1, _("CONFLICT (rename/rename): "
1175 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1176 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1177 one
->path
, a
->path
, ci
->branch1
,
1178 one
->path
, b
->path
, ci
->branch2
,
1179 o
->call_depth
? _(" (left unresolved)") : "");
1180 if (o
->call_depth
) {
1181 struct merge_file_info mfi
;
1182 struct diff_filespec other
;
1183 struct diff_filespec
*add
;
1184 mfi
= merge_file_one(o
, one
->path
,
1185 &one
->oid
, one
->mode
,
1188 ci
->branch1
, ci
->branch2
);
1190 * FIXME: For rename/add-source conflicts (if we could detect
1191 * such), this is wrong. We should instead find a unique
1192 * pathname and then either rename the add-source file to that
1193 * unique path, or use that unique path instead of src here.
1195 update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
);
1198 * Above, we put the merged content at the merge-base's
1199 * path. Now we usually need to delete both a->path and
1200 * b->path. However, the rename on each side of the merge
1201 * could also be involved in a rename/add conflict. In
1202 * such cases, we should keep the added file around,
1203 * resolving the conflict at that path in its favor.
1205 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1207 update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
);
1209 remove_file_from_cache(a
->path
);
1210 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1212 update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
);
1214 remove_file_from_cache(b
->path
);
1216 handle_file(o
, a
, 2, ci
);
1217 handle_file(o
, b
, 3, ci
);
1221 static void conflict_rename_rename_2to1(struct merge_options
*o
,
1222 struct rename_conflict_info
*ci
)
1224 /* Two files, a & b, were renamed to the same thing, c. */
1225 struct diff_filespec
*a
= ci
->pair1
->one
;
1226 struct diff_filespec
*b
= ci
->pair2
->one
;
1227 struct diff_filespec
*c1
= ci
->pair1
->two
;
1228 struct diff_filespec
*c2
= ci
->pair2
->two
;
1229 char *path
= c1
->path
; /* == c2->path */
1230 struct merge_file_info mfi_c1
;
1231 struct merge_file_info mfi_c2
;
1233 output(o
, 1, _("CONFLICT (rename/rename): "
1234 "Rename %s->%s in %s. "
1235 "Rename %s->%s in %s"),
1236 a
->path
, c1
->path
, ci
->branch1
,
1237 b
->path
, c2
->path
, ci
->branch2
);
1239 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1240 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1242 mfi_c1
= merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1243 o
->branch1
, c1
->path
,
1244 o
->branch2
, ci
->ren1_other
.path
);
1245 mfi_c2
= merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1246 o
->branch1
, ci
->ren2_other
.path
,
1247 o
->branch2
, c2
->path
);
1249 if (o
->call_depth
) {
1251 * If mfi_c1.clean && mfi_c2.clean, then it might make
1252 * sense to do a two-way merge of those results. But, I
1253 * think in all cases, it makes sense to have the virtual
1254 * merge base just undo the renames; they can be detected
1255 * again later for the non-recursive merge.
1257 remove_file(o
, 0, path
, 0);
1258 update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1259 update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
, b
->path
);
1261 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1262 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1263 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1264 a
->path
, new_path1
, b
->path
, new_path2
);
1265 remove_file(o
, 0, path
, 0);
1266 update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1267 update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
, new_path2
);
1273 static int process_renames(struct merge_options
*o
,
1274 struct string_list
*a_renames
,
1275 struct string_list
*b_renames
)
1277 int clean_merge
= 1, i
, j
;
1278 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1279 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1280 const struct rename
*sre
;
1282 for (i
= 0; i
< a_renames
->nr
; i
++) {
1283 sre
= a_renames
->items
[i
].util
;
1284 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1287 for (i
= 0; i
< b_renames
->nr
; i
++) {
1288 sre
= b_renames
->items
[i
].util
;
1289 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1293 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1294 struct string_list
*renames1
, *renames2Dst
;
1295 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1296 const char *branch1
, *branch2
;
1297 const char *ren1_src
, *ren1_dst
;
1298 struct string_list_item
*lookup
;
1300 if (i
>= a_renames
->nr
) {
1301 ren2
= b_renames
->items
[j
++].util
;
1302 } else if (j
>= b_renames
->nr
) {
1303 ren1
= a_renames
->items
[i
++].util
;
1305 int compare
= strcmp(a_renames
->items
[i
].string
,
1306 b_renames
->items
[j
].string
);
1308 ren1
= a_renames
->items
[i
++].util
;
1310 ren2
= b_renames
->items
[j
++].util
;
1313 /* TODO: refactor, so that 1/2 are not needed */
1315 renames1
= a_renames
;
1316 renames2Dst
= &b_by_dst
;
1317 branch1
= o
->branch1
;
1318 branch2
= o
->branch2
;
1321 renames1
= b_renames
;
1322 renames2Dst
= &a_by_dst
;
1323 branch1
= o
->branch2
;
1324 branch2
= o
->branch1
;
1330 if (ren1
->processed
)
1332 ren1
->processed
= 1;
1333 ren1
->dst_entry
->processed
= 1;
1334 /* BUG: We should only mark src_entry as processed if we
1335 * are not dealing with a rename + add-source case.
1337 ren1
->src_entry
->processed
= 1;
1339 ren1_src
= ren1
->pair
->one
->path
;
1340 ren1_dst
= ren1
->pair
->two
->path
;
1343 /* One file renamed on both sides */
1344 const char *ren2_src
= ren2
->pair
->one
->path
;
1345 const char *ren2_dst
= ren2
->pair
->two
->path
;
1346 enum rename_type rename_type
;
1347 if (strcmp(ren1_src
, ren2_src
) != 0)
1348 die("ren1_src != ren2_src");
1349 ren2
->dst_entry
->processed
= 1;
1350 ren2
->processed
= 1;
1351 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1352 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1355 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1356 /* BUG: We should only remove ren1_src in
1357 * the base stage (think of rename +
1358 * add-source cases).
1360 remove_file(o
, 1, ren1_src
, 1);
1361 update_entry(ren1
->dst_entry
,
1366 setup_rename_conflict_info(rename_type
,
1376 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1377 /* Two different files renamed to the same thing */
1379 ren2
= lookup
->util
;
1380 ren2_dst
= ren2
->pair
->two
->path
;
1381 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1382 die("ren1_dst != ren2_dst");
1385 ren2
->processed
= 1;
1387 * BUG: We should only mark src_entry as processed
1388 * if we are not dealing with a rename + add-source
1391 ren2
->src_entry
->processed
= 1;
1393 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1405 /* Renamed in 1, maybe changed in 2 */
1406 /* we only use sha1 and mode of these */
1407 struct diff_filespec src_other
, dst_other
;
1411 * unpack_trees loads entries from common-commit
1412 * into stage 1, from head-commit into stage 2, and
1413 * from merge-commit into stage 3. We keep track
1414 * of which side corresponds to the rename.
1416 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1417 int other_stage
= a_renames
== renames1
? 3 : 2;
1419 /* BUG: We should only remove ren1_src in the base
1420 * stage and in other_stage (think of rename +
1423 remove_file(o
, 1, ren1_src
,
1424 renamed_stage
== 2 || !was_tracked(ren1_src
));
1426 oidcpy(&src_other
.oid
,
1427 &ren1
->src_entry
->stages
[other_stage
].oid
);
1428 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1429 oidcpy(&dst_other
.oid
,
1430 &ren1
->dst_entry
->stages
[other_stage
].oid
);
1431 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1434 if (oid_eq(&src_other
.oid
, &null_oid
)) {
1435 setup_rename_conflict_info(RENAME_DELETE
,
1445 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1446 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
1448 * Added file on the other side identical to
1449 * the file being renamed: clean merge.
1450 * Also, there is no need to overwrite the
1451 * file already in the working copy, so call
1452 * update_file_flags() instead of
1455 update_file_flags(o
,
1456 &ren1
->pair
->two
->oid
,
1457 ren1
->pair
->two
->mode
,
1459 1, /* update_cache */
1461 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
1464 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1466 ren1_src
, ren1_dst
, branch1
,
1468 if (o
->call_depth
) {
1469 struct merge_file_info mfi
;
1470 mfi
= merge_file_one(o
, ren1_dst
, &null_oid
, 0,
1471 &ren1
->pair
->two
->oid
,
1472 ren1
->pair
->two
->mode
,
1476 output(o
, 1, _("Adding merged %s"), ren1_dst
);
1477 update_file(o
, 0, &mfi
.oid
,
1478 mfi
.mode
, ren1_dst
);
1481 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1482 output(o
, 1, _("Adding as %s instead"), new_path
);
1483 update_file(o
, 0, &dst_other
.oid
,
1484 dst_other
.mode
, new_path
);
1491 struct diff_filespec
*one
, *a
, *b
;
1492 src_other
.path
= (char *)ren1_src
;
1494 one
= ren1
->pair
->one
;
1495 if (a_renames
== renames1
) {
1496 a
= ren1
->pair
->two
;
1499 b
= ren1
->pair
->two
;
1502 update_entry(ren1
->dst_entry
, one
, a
, b
);
1503 setup_rename_conflict_info(RENAME_NORMAL
,
1516 string_list_clear(&a_by_dst
, 0);
1517 string_list_clear(&b_by_dst
, 0);
1522 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
1524 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
1527 static int read_oid_strbuf(const struct object_id
*oid
, struct strbuf
*dst
)
1530 enum object_type type
;
1532 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
1534 return error(_("cannot read object %s"), oid_to_hex(oid
));
1535 if (type
!= OBJ_BLOB
) {
1537 return error(_("object %s is not a blob"), oid_to_hex(oid
));
1539 strbuf_attach(dst
, buf
, size
, size
+ 1);
1543 static int blob_unchanged(const struct object_id
*o_oid
,
1545 const struct object_id
*a_oid
,
1547 int renormalize
, const char *path
)
1549 struct strbuf o
= STRBUF_INIT
;
1550 struct strbuf a
= STRBUF_INIT
;
1551 int ret
= 0; /* assume changed for safety */
1553 if (a_mode
!= o_mode
)
1555 if (oid_eq(o_oid
, a_oid
))
1560 assert(o_oid
&& a_oid
);
1561 if (read_oid_strbuf(o_oid
, &o
) || read_oid_strbuf(a_oid
, &a
))
1564 * Note: binary | is used so that both renormalizations are
1565 * performed. Comparison can be skipped if both files are
1566 * unchanged since their sha1s have already been compared.
1568 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1569 renormalize_buffer(path
, a
.buf
, a
.len
, &a
))
1570 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1578 static void handle_modify_delete(struct merge_options
*o
,
1580 struct object_id
*o_oid
, int o_mode
,
1581 struct object_id
*a_oid
, int a_mode
,
1582 struct object_id
*b_oid
, int b_mode
)
1584 handle_change_delete(o
,
1589 _("modify"), _("modified"));
1592 static int merge_content(struct merge_options
*o
,
1594 struct object_id
*o_oid
, int o_mode
,
1595 struct object_id
*a_oid
, int a_mode
,
1596 struct object_id
*b_oid
, int b_mode
,
1597 struct rename_conflict_info
*rename_conflict_info
)
1599 const char *reason
= _("content");
1600 const char *path1
= NULL
, *path2
= NULL
;
1601 struct merge_file_info mfi
;
1602 struct diff_filespec one
, a
, b
;
1603 unsigned df_conflict_remains
= 0;
1606 reason
= _("add/add");
1607 o_oid
= (struct object_id
*)&null_oid
;
1609 one
.path
= a
.path
= b
.path
= (char *)path
;
1610 oidcpy(&one
.oid
, o_oid
);
1612 oidcpy(&a
.oid
, a_oid
);
1614 oidcpy(&b
.oid
, b_oid
);
1617 if (rename_conflict_info
) {
1618 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1620 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1621 pair1
->two
->path
: pair1
->one
->path
;
1622 /* If rename_conflict_info->pair2 != NULL, we are in
1623 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1626 path2
= (rename_conflict_info
->pair2
||
1627 o
->branch2
== rename_conflict_info
->branch1
) ?
1628 pair1
->two
->path
: pair1
->one
->path
;
1630 if (dir_in_way(path
, !o
->call_depth
))
1631 df_conflict_remains
= 1;
1633 mfi
= merge_file_special_markers(o
, &one
, &a
, &b
,
1637 if (mfi
.clean
&& !df_conflict_remains
&&
1638 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
1639 int path_renamed_outside_HEAD
;
1640 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
1642 * The content merge resulted in the same file contents we
1643 * already had. We can return early if those file contents
1644 * are recorded at the correct path (which may not be true
1645 * if the merge involves a rename).
1647 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1648 if (!path_renamed_outside_HEAD
) {
1649 add_cacheinfo(mfi
.mode
, &mfi
.oid
, path
,
1650 0, (!o
->call_depth
), 0);
1654 output(o
, 2, _("Auto-merging %s"), path
);
1657 if (S_ISGITLINK(mfi
.mode
))
1658 reason
= _("submodule");
1659 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
1661 if (rename_conflict_info
&& !df_conflict_remains
)
1662 update_stages(path
, &one
, &a
, &b
);
1665 if (df_conflict_remains
) {
1667 if (o
->call_depth
) {
1668 remove_file_from_cache(path
);
1671 update_stages(path
, &one
, &a
, &b
);
1673 int file_from_stage2
= was_tracked(path
);
1674 struct diff_filespec merged
;
1675 oidcpy(&merged
.oid
, &mfi
.oid
);
1676 merged
.mode
= mfi
.mode
;
1678 update_stages(path
, NULL
,
1679 file_from_stage2
? &merged
: NULL
,
1680 file_from_stage2
? NULL
: &merged
);
1684 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1685 output(o
, 1, _("Adding as %s instead"), new_path
);
1686 update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
);
1690 update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
);
1696 /* Per entry merge function */
1697 static int process_entry(struct merge_options
*o
,
1698 const char *path
, struct stage_data
*entry
)
1700 int clean_merge
= 1;
1701 int normalize
= o
->renormalize
;
1702 unsigned o_mode
= entry
->stages
[1].mode
;
1703 unsigned a_mode
= entry
->stages
[2].mode
;
1704 unsigned b_mode
= entry
->stages
[3].mode
;
1705 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
1706 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
1707 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
1709 entry
->processed
= 1;
1710 if (entry
->rename_conflict_info
) {
1711 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1712 switch (conflict_info
->rename_type
) {
1714 case RENAME_ONE_FILE_TO_ONE
:
1715 clean_merge
= merge_content(o
, path
,
1716 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1721 conflict_rename_delete(o
, conflict_info
->pair1
,
1722 conflict_info
->branch1
,
1723 conflict_info
->branch2
);
1725 case RENAME_ONE_FILE_TO_TWO
:
1727 conflict_rename_rename_1to2(o
, conflict_info
);
1729 case RENAME_TWO_FILES_TO_ONE
:
1731 conflict_rename_rename_2to1(o
, conflict_info
);
1734 entry
->processed
= 0;
1737 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
1738 /* Case A: Deleted in one */
1739 if ((!a_oid
&& !b_oid
) ||
1740 (!b_oid
&& blob_unchanged(o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
1741 (!a_oid
&& blob_unchanged(o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
1742 /* Deleted in both or deleted in one and
1743 * unchanged in the other */
1745 output(o
, 2, _("Removing %s"), path
);
1746 /* do not touch working file if it did not exist */
1747 remove_file(o
, 1, path
, !a_oid
);
1749 /* Modify/delete; deleted side may have put a directory in the way */
1751 handle_modify_delete(o
, path
, o_oid
, o_mode
,
1752 a_oid
, a_mode
, b_oid
, b_mode
);
1754 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
1755 (!o_oid
&& !a_oid
&& b_oid
)) {
1756 /* Case B: Added in one. */
1757 /* [nothing|directory] -> ([nothing|directory], file) */
1759 const char *add_branch
;
1760 const char *other_branch
;
1762 const struct object_id
*oid
;
1766 add_branch
= o
->branch1
;
1767 other_branch
= o
->branch2
;
1770 conf
= _("file/directory");
1772 add_branch
= o
->branch2
;
1773 other_branch
= o
->branch1
;
1776 conf
= _("directory/file");
1778 if (dir_in_way(path
, !o
->call_depth
)) {
1779 char *new_path
= unique_path(o
, path
, add_branch
);
1781 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1783 conf
, path
, other_branch
, path
, new_path
);
1784 update_file(o
, 0, oid
, mode
, new_path
);
1786 remove_file_from_cache(path
);
1789 output(o
, 2, _("Adding %s"), path
);
1790 /* do not overwrite file if already present */
1791 update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
);
1793 } else if (a_oid
&& b_oid
) {
1794 /* Case C: Added in both (check for same permissions) and */
1795 /* case D: Modified in both, but differently. */
1796 clean_merge
= merge_content(o
, path
,
1797 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1799 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
1801 * this entry was deleted altogether. a_mode == 0 means
1802 * we had that path and want to actively remove it.
1804 remove_file(o
, 1, path
, !a_mode
);
1806 die(_("Fatal merge failure, shouldn't happen."));
1811 int merge_trees(struct merge_options
*o
,
1814 struct tree
*common
,
1815 struct tree
**result
)
1819 if (o
->subtree_shift
) {
1820 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1821 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1824 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
1825 output(o
, 0, _("Already up-to-date!"));
1830 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1833 if (show(o
, 4) || o
->call_depth
)
1834 die(_("merging of trees %s and %s failed"),
1835 oid_to_hex(&head
->object
.oid
),
1836 oid_to_hex(&merge
->object
.oid
));
1841 if (unmerged_cache()) {
1842 struct string_list
*entries
, *re_head
, *re_merge
;
1844 string_list_clear(&o
->current_file_set
, 1);
1845 string_list_clear(&o
->current_directory_set
, 1);
1846 get_files_dirs(o
, head
);
1847 get_files_dirs(o
, merge
);
1849 entries
= get_unmerged();
1850 record_df_conflict_files(o
, entries
);
1851 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1852 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1853 clean
= process_renames(o
, re_head
, re_merge
);
1854 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
1855 const char *path
= entries
->items
[i
].string
;
1856 struct stage_data
*e
= entries
->items
[i
].util
;
1858 && !process_entry(o
, path
, e
))
1861 for (i
= 0; i
< entries
->nr
; i
++) {
1862 struct stage_data
*e
= entries
->items
[i
].util
;
1864 die(_("Unprocessed path??? %s"),
1865 entries
->items
[i
].string
);
1868 string_list_clear(re_merge
, 0);
1869 string_list_clear(re_head
, 0);
1870 string_list_clear(entries
, 1);
1880 *result
= write_tree_from_memory(o
);
1885 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1887 struct commit_list
*next
= NULL
, *current
, *backup
;
1888 for (current
= list
; current
; current
= backup
) {
1889 backup
= current
->next
;
1890 current
->next
= next
;
1897 * Merge the commits h1 and h2, return the resulting virtual
1898 * commit object and a flag indicating the cleanness of the merge.
1900 int merge_recursive(struct merge_options
*o
,
1903 struct commit_list
*ca
,
1904 struct commit
**result
)
1906 struct commit_list
*iter
;
1907 struct commit
*merged_common_ancestors
;
1908 struct tree
*mrtree
= mrtree
;
1912 output(o
, 4, _("Merging:"));
1913 output_commit_title(o
, h1
);
1914 output_commit_title(o
, h2
);
1918 ca
= get_merge_bases(h1
, h2
);
1919 ca
= reverse_commit_list(ca
);
1923 unsigned cnt
= commit_list_count(ca
);
1925 output(o
, 5, Q_("found %u common ancestor:",
1926 "found %u common ancestors:", cnt
), cnt
);
1927 for (iter
= ca
; iter
; iter
= iter
->next
)
1928 output_commit_title(o
, iter
->item
);
1931 merged_common_ancestors
= pop_commit(&ca
);
1932 if (merged_common_ancestors
== NULL
) {
1933 /* if there is no common ancestor, use an empty tree */
1936 tree
= lookup_tree(EMPTY_TREE_SHA1_BIN
);
1937 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1940 for (iter
= ca
; iter
; iter
= iter
->next
) {
1941 const char *saved_b1
, *saved_b2
;
1944 * When the merge fails, the result contains files
1945 * with conflict markers. The cleanness flag is
1946 * ignored, it was never actually used, as result of
1947 * merge_trees has always overwritten it: the committed
1948 * "conflicts" were already resolved.
1951 saved_b1
= o
->branch1
;
1952 saved_b2
= o
->branch2
;
1953 o
->branch1
= "Temporary merge branch 1";
1954 o
->branch2
= "Temporary merge branch 2";
1955 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1956 NULL
, &merged_common_ancestors
);
1957 o
->branch1
= saved_b1
;
1958 o
->branch2
= saved_b2
;
1961 if (!merged_common_ancestors
)
1962 die(_("merge returned no commit"));
1969 o
->ancestor
= "merged common ancestors";
1970 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1973 if (o
->call_depth
) {
1974 *result
= make_virtual_commit(mrtree
, "merged tree");
1975 commit_list_insert(h1
, &(*result
)->parents
);
1976 commit_list_insert(h2
, &(*result
)->parents
->next
);
1980 diff_warn_rename_limit("merge.renamelimit",
1981 o
->needed_rename_limit
, 0);
1985 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
1987 struct object
*object
;
1989 object
= deref_tag(parse_object(oid
->hash
), name
, strlen(name
));
1992 if (object
->type
== OBJ_TREE
)
1993 return make_virtual_commit((struct tree
*)object
, name
);
1994 if (object
->type
!= OBJ_COMMIT
)
1996 if (parse_commit((struct commit
*)object
))
1998 return (struct commit
*)object
;
2001 int merge_recursive_generic(struct merge_options
*o
,
2002 const struct object_id
*head
,
2003 const struct object_id
*merge
,
2005 const struct object_id
**base_list
,
2006 struct commit
**result
)
2009 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
2010 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
2011 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
2012 struct commit_list
*ca
= NULL
;
2016 for (i
= 0; i
< num_base_list
; ++i
) {
2017 struct commit
*base
;
2018 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
2019 return error(_("Could not parse object '%s'"),
2020 oid_to_hex(base_list
[i
]));
2021 commit_list_insert(base
, &ca
);
2025 hold_locked_index(lock
, 1);
2026 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
2028 if (active_cache_changed
&&
2029 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
2030 return error(_("Unable to write index."));
2032 return clean
? 0 : 1;
2035 static void merge_recursive_config(struct merge_options
*o
)
2037 git_config_get_int("merge.verbosity", &o
->verbosity
);
2038 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
2039 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
2040 git_config(git_xmerge_config
, NULL
);
2043 void init_merge_options(struct merge_options
*o
)
2045 memset(o
, 0, sizeof(struct merge_options
));
2047 o
->buffer_output
= 1;
2048 o
->diff_rename_limit
= -1;
2049 o
->merge_rename_limit
= -1;
2051 o
->detect_rename
= 1;
2052 merge_recursive_config(o
);
2053 if (getenv("GIT_MERGE_VERBOSITY"))
2055 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
2056 if (o
->verbosity
>= 5)
2057 o
->buffer_output
= 0;
2058 strbuf_init(&o
->obuf
, 0);
2059 string_list_init(&o
->current_file_set
, 1);
2060 string_list_init(&o
->current_directory_set
, 1);
2061 string_list_init(&o
->df_conflict_file_set
, 1);
2064 int parse_merge_opt(struct merge_options
*o
, const char *s
)
2070 if (!strcmp(s
, "ours"))
2071 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
2072 else if (!strcmp(s
, "theirs"))
2073 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
2074 else if (!strcmp(s
, "subtree"))
2075 o
->subtree_shift
= "";
2076 else if (skip_prefix(s
, "subtree=", &arg
))
2077 o
->subtree_shift
= arg
;
2078 else if (!strcmp(s
, "patience"))
2079 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
2080 else if (!strcmp(s
, "histogram"))
2081 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
2082 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
2083 long value
= parse_algorithm_value(arg
);
2086 /* clear out previous settings */
2087 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
2088 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
2089 o
->xdl_opts
|= value
;
2091 else if (!strcmp(s
, "ignore-space-change"))
2092 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2093 else if (!strcmp(s
, "ignore-all-space"))
2094 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2095 else if (!strcmp(s
, "ignore-space-at-eol"))
2096 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2097 else if (!strcmp(s
, "renormalize"))
2099 else if (!strcmp(s
, "no-renormalize"))
2101 else if (!strcmp(s
, "no-renames"))
2102 o
->detect_rename
= 0;
2103 else if (!strcmp(s
, "find-renames")) {
2104 o
->detect_rename
= 1;
2105 o
->rename_score
= 0;
2107 else if (skip_prefix(s
, "find-renames=", &arg
) ||
2108 skip_prefix(s
, "rename-threshold=", &arg
)) {
2109 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
2111 o
->detect_rename
= 1;