2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include "cache-tree.h"
14 #include "tree-walk.h"
18 #include "unpack-trees.h"
19 #include "string-list.h"
20 #include "xdiff-interface.h"
23 #include "merge-recursive.h"
25 #include "submodule.h"
27 struct path_hashmap_entry
{
28 struct hashmap_entry e
;
29 char path
[FLEX_ARRAY
];
32 static int path_hashmap_cmp(const void *cmp_data
,
34 const void *entry_or_key
,
37 const struct path_hashmap_entry
*a
= entry
;
38 const struct path_hashmap_entry
*b
= entry_or_key
;
39 const char *key
= keydata
;
42 return strcasecmp(a
->path
, key
? key
: b
->path
);
44 return strcmp(a
->path
, key
? key
: b
->path
);
47 static unsigned int path_hash(const char *path
)
49 return ignore_case
? strihash(path
) : strhash(path
);
52 static void flush_output(struct merge_options
*o
)
54 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
55 fputs(o
->obuf
.buf
, stdout
);
56 strbuf_reset(&o
->obuf
);
60 static int err(struct merge_options
*o
, const char *err
, ...)
64 if (o
->buffer_output
< 2)
67 strbuf_complete(&o
->obuf
, '\n');
68 strbuf_addstr(&o
->obuf
, "error: ");
70 va_start(params
, err
);
71 strbuf_vaddf(&o
->obuf
, err
, params
);
73 if (o
->buffer_output
> 1)
74 strbuf_addch(&o
->obuf
, '\n');
76 error("%s", o
->obuf
.buf
);
77 strbuf_reset(&o
->obuf
);
83 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
84 const char *subtree_shift
)
86 struct object_id shifted
;
88 if (!*subtree_shift
) {
89 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
91 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
94 if (!oidcmp(&two
->object
.oid
, &shifted
))
96 return lookup_tree(&shifted
);
99 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
101 struct commit
*commit
= alloc_commit_node();
103 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
105 commit
->object
.parsed
= 1;
110 * Since we use get_tree_entry(), which does not put the read object into
111 * the object pool, we cannot rely on a == b.
113 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
117 return a
&& b
&& oidcmp(a
, b
) == 0;
123 RENAME_ONE_FILE_TO_ONE
,
124 RENAME_ONE_FILE_TO_TWO
,
125 RENAME_TWO_FILES_TO_ONE
128 struct rename_conflict_info
{
129 enum rename_type rename_type
;
130 struct diff_filepair
*pair1
;
131 struct diff_filepair
*pair2
;
134 struct stage_data
*dst_entry1
;
135 struct stage_data
*dst_entry2
;
136 struct diff_filespec ren1_other
;
137 struct diff_filespec ren2_other
;
141 * Since we want to write the index eventually, we cannot reuse the index
142 * for these (temporary) data.
147 struct object_id oid
;
149 struct rename_conflict_info
*rename_conflict_info
;
150 unsigned processed
:1;
153 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
154 struct diff_filepair
*pair1
,
155 struct diff_filepair
*pair2
,
158 struct stage_data
*dst_entry1
,
159 struct stage_data
*dst_entry2
,
160 struct merge_options
*o
,
161 struct stage_data
*src_entry1
,
162 struct stage_data
*src_entry2
)
164 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
165 ci
->rename_type
= rename_type
;
167 ci
->branch1
= branch1
;
168 ci
->branch2
= branch2
;
170 ci
->dst_entry1
= dst_entry1
;
171 dst_entry1
->rename_conflict_info
= ci
;
172 dst_entry1
->processed
= 0;
174 assert(!pair2
== !dst_entry2
);
176 ci
->dst_entry2
= dst_entry2
;
178 dst_entry2
->rename_conflict_info
= ci
;
181 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
183 * For each rename, there could have been
184 * modifications on the side of history where that
185 * file was not renamed.
187 int ostage1
= o
->branch1
== branch1
? 3 : 2;
188 int ostage2
= ostage1
^ 1;
190 ci
->ren1_other
.path
= pair1
->one
->path
;
191 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
192 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
194 ci
->ren2_other
.path
= pair2
->one
->path
;
195 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
196 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
200 static int show(struct merge_options
*o
, int v
)
202 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
205 __attribute__((format (printf
, 3, 4)))
206 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
213 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
216 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
219 strbuf_addch(&o
->obuf
, '\n');
220 if (!o
->buffer_output
)
224 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
226 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
228 strbuf_addf(&o
->obuf
, "virtual %s\n",
229 merge_remote_util(commit
)->name
);
231 strbuf_add_unique_abbrev(&o
->obuf
, &commit
->object
.oid
,
233 strbuf_addch(&o
->obuf
, ' ');
234 if (parse_commit(commit
) != 0)
235 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
238 const char *msg
= get_commit_buffer(commit
, NULL
);
239 int len
= find_commit_subject(msg
, &title
);
241 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
242 unuse_commit_buffer(commit
, msg
);
248 static int add_cacheinfo(struct merge_options
*o
,
249 unsigned int mode
, const struct object_id
*oid
,
250 const char *path
, int stage
, int refresh
, int options
)
252 struct cache_entry
*ce
;
255 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
257 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
259 ret
= add_cache_entry(ce
, options
);
261 struct cache_entry
*nce
;
263 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
265 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
267 ret
= add_cache_entry(nce
, options
);
272 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
275 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
278 static int git_merge_trees(int index_only
,
284 struct tree_desc t
[3];
285 struct unpack_trees_options opts
;
287 memset(&opts
, 0, sizeof(opts
));
294 opts
.fn
= threeway_merge
;
295 opts
.src_index
= &the_index
;
296 opts
.dst_index
= &the_index
;
297 setup_unpack_trees_porcelain(&opts
, "merge");
299 init_tree_desc_from_tree(t
+0, common
);
300 init_tree_desc_from_tree(t
+1, head
);
301 init_tree_desc_from_tree(t
+2, merge
);
303 rc
= unpack_trees(3, t
, &opts
);
304 cache_tree_free(&active_cache_tree
);
308 struct tree
*write_tree_from_memory(struct merge_options
*o
)
310 struct tree
*result
= NULL
;
312 if (unmerged_cache()) {
314 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
315 for (i
= 0; i
< active_nr
; i
++) {
316 const struct cache_entry
*ce
= active_cache
[i
];
318 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
319 (int)ce_namelen(ce
), ce
->name
);
321 die("BUG: unmerged index entries in merge-recursive.c");
324 if (!active_cache_tree
)
325 active_cache_tree
= cache_tree();
327 if (!cache_tree_fully_valid(active_cache_tree
) &&
328 cache_tree_update(&the_index
, 0) < 0) {
329 err(o
, _("error building trees"));
333 result
= lookup_tree(&active_cache_tree
->oid
);
338 static int save_files_dirs(const struct object_id
*oid
,
339 struct strbuf
*base
, const char *path
,
340 unsigned int mode
, int stage
, void *context
)
342 struct path_hashmap_entry
*entry
;
343 int baselen
= base
->len
;
344 struct merge_options
*o
= context
;
346 strbuf_addstr(base
, path
);
348 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
349 hashmap_entry_init(entry
, path_hash(entry
->path
));
350 hashmap_add(&o
->current_file_dir_set
, entry
);
352 strbuf_setlen(base
, baselen
);
353 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
356 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
358 struct pathspec match_all
;
359 memset(&match_all
, 0, sizeof(match_all
));
360 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
364 * Returns an index_entry instance which doesn't have to correspond to
365 * a real cache entry in Git's index.
367 static struct stage_data
*insert_stage_data(const char *path
,
368 struct tree
*o
, struct tree
*a
, struct tree
*b
,
369 struct string_list
*entries
)
371 struct string_list_item
*item
;
372 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
373 get_tree_entry(&o
->object
.oid
, path
,
374 &e
->stages
[1].oid
, &e
->stages
[1].mode
);
375 get_tree_entry(&a
->object
.oid
, path
,
376 &e
->stages
[2].oid
, &e
->stages
[2].mode
);
377 get_tree_entry(&b
->object
.oid
, path
,
378 &e
->stages
[3].oid
, &e
->stages
[3].mode
);
379 item
= string_list_insert(entries
, path
);
385 * Create a dictionary mapping file names to stage_data objects. The
386 * dictionary contains one entry for every path with a non-zero stage entry.
388 static struct string_list
*get_unmerged(void)
390 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
393 unmerged
->strdup_strings
= 1;
395 for (i
= 0; i
< active_nr
; i
++) {
396 struct string_list_item
*item
;
397 struct stage_data
*e
;
398 const struct cache_entry
*ce
= active_cache
[i
];
402 item
= string_list_lookup(unmerged
, ce
->name
);
404 item
= string_list_insert(unmerged
, ce
->name
);
405 item
->util
= xcalloc(1, sizeof(struct stage_data
));
408 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
409 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
415 static int string_list_df_name_compare(const char *one
, const char *two
)
417 int onelen
= strlen(one
);
418 int twolen
= strlen(two
);
420 * Here we only care that entries for D/F conflicts are
421 * adjacent, in particular with the file of the D/F conflict
422 * appearing before files below the corresponding directory.
423 * The order of the rest of the list is irrelevant for us.
425 * To achieve this, we sort with df_name_compare and provide
426 * the mode S_IFDIR so that D/F conflicts will sort correctly.
427 * We use the mode S_IFDIR for everything else for simplicity,
428 * since in other cases any changes in their order due to
429 * sorting cause no problems for us.
431 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
432 two
, twolen
, S_IFDIR
);
434 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
435 * that 'foo' comes before 'foo/bar'.
439 return onelen
- twolen
;
442 static void record_df_conflict_files(struct merge_options
*o
,
443 struct string_list
*entries
)
445 /* If there is a D/F conflict and the file for such a conflict
446 * currently exist in the working tree, we want to allow it to be
447 * removed to make room for the corresponding directory if needed.
448 * The files underneath the directories of such D/F conflicts will
449 * be processed before the corresponding file involved in the D/F
450 * conflict. If the D/F directory ends up being removed by the
451 * merge, then we won't have to touch the D/F file. If the D/F
452 * directory needs to be written to the working copy, then the D/F
453 * file will simply be removed (in make_room_for_path()) to make
454 * room for the necessary paths. Note that if both the directory
455 * and the file need to be present, then the D/F file will be
456 * reinstated with a new unique name at the time it is processed.
458 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
459 const char *last_file
= NULL
;
464 * If we're merging merge-bases, we don't want to bother with
465 * any working directory changes.
470 /* Ensure D/F conflicts are adjacent in the entries list. */
471 for (i
= 0; i
< entries
->nr
; i
++) {
472 struct string_list_item
*next
= &entries
->items
[i
];
473 string_list_append(&df_sorted_entries
, next
->string
)->util
=
476 df_sorted_entries
.cmp
= string_list_df_name_compare
;
477 string_list_sort(&df_sorted_entries
);
479 string_list_clear(&o
->df_conflict_file_set
, 1);
480 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
481 const char *path
= df_sorted_entries
.items
[i
].string
;
482 int len
= strlen(path
);
483 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
486 * Check if last_file & path correspond to a D/F conflict;
487 * i.e. whether path is last_file+'/'+<something>.
488 * If so, record that it's okay to remove last_file to make
489 * room for path and friends if needed.
493 memcmp(path
, last_file
, last_len
) == 0 &&
494 path
[last_len
] == '/') {
495 string_list_insert(&o
->df_conflict_file_set
, last_file
);
499 * Determine whether path could exist as a file in the
500 * working directory as a possible D/F conflict. This
501 * will only occur when it exists in stage 2 as a
504 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
511 string_list_clear(&df_sorted_entries
, 0);
515 struct diff_filepair
*pair
;
517 * Purpose of src_entry and dst_entry:
519 * If 'before' is renamed to 'after' then src_entry will contain
520 * the versions of 'before' from the merge_base, HEAD, and MERGE in
521 * stages 1, 2, and 3; dst_entry will contain the respective
522 * versions of 'after' in corresponding locations. Thus, we have a
523 * total of six modes and oids, though some will be null. (Stage 0
524 * is ignored; we're interested in handling conflicts.)
526 * Since we don't turn on break-rewrites by default, neither
527 * src_entry nor dst_entry can have all three of their stages have
528 * non-null oids, meaning at most four of the six will be non-null.
529 * Also, since this is a rename, both src_entry and dst_entry will
530 * have at least one non-null oid, meaning at least two will be
531 * non-null. Of the six oids, a typical rename will have three be
532 * non-null. Only two implies a rename/delete, and four implies a
535 struct stage_data
*src_entry
;
536 struct stage_data
*dst_entry
;
537 unsigned processed
:1;
540 static int update_stages(struct merge_options
*opt
, const char *path
,
541 const struct diff_filespec
*o
,
542 const struct diff_filespec
*a
,
543 const struct diff_filespec
*b
)
547 * NOTE: It is usually a bad idea to call update_stages on a path
548 * before calling update_file on that same path, since it can
549 * sometimes lead to spurious "refusing to lose untracked file..."
550 * messages from update_file (via make_room_for path via
551 * would_lose_untracked). Instead, reverse the order of the calls
552 * (executing update_file first and then update_stages).
555 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
557 if (remove_file_from_cache(path
))
560 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
563 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
566 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
571 static void update_entry(struct stage_data
*entry
,
572 struct diff_filespec
*o
,
573 struct diff_filespec
*a
,
574 struct diff_filespec
*b
)
576 entry
->processed
= 0;
577 entry
->stages
[1].mode
= o
->mode
;
578 entry
->stages
[2].mode
= a
->mode
;
579 entry
->stages
[3].mode
= b
->mode
;
580 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
581 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
582 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
585 static int remove_file(struct merge_options
*o
, int clean
,
586 const char *path
, int no_wd
)
588 int update_cache
= o
->call_depth
|| clean
;
589 int update_working_directory
= !o
->call_depth
&& !no_wd
;
592 if (remove_file_from_cache(path
))
595 if (update_working_directory
) {
597 struct cache_entry
*ce
;
598 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
599 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
602 if (remove_path(path
))
608 /* add a string to a strbuf, but converting "/" to "_" */
609 static void add_flattened_path(struct strbuf
*out
, const char *s
)
612 strbuf_addstr(out
, s
);
613 for (; i
< out
->len
; i
++)
614 if (out
->buf
[i
] == '/')
618 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
620 struct path_hashmap_entry
*entry
;
621 struct strbuf newpath
= STRBUF_INIT
;
625 strbuf_addf(&newpath
, "%s~", path
);
626 add_flattened_path(&newpath
, branch
);
628 base_len
= newpath
.len
;
629 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
630 path_hash(newpath
.buf
), newpath
.buf
) ||
631 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
632 strbuf_setlen(&newpath
, base_len
);
633 strbuf_addf(&newpath
, "_%d", suffix
++);
636 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
637 hashmap_entry_init(entry
, path_hash(entry
->path
));
638 hashmap_add(&o
->current_file_dir_set
, entry
);
639 return strbuf_detach(&newpath
, NULL
);
643 * Check whether a directory in the index is in the way of an incoming
644 * file. Return 1 if so. If check_working_copy is non-zero, also
645 * check the working directory. If empty_ok is non-zero, also return
646 * 0 in the case where the working-tree dir exists but is empty.
648 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
651 struct strbuf dirpath
= STRBUF_INIT
;
654 strbuf_addstr(&dirpath
, path
);
655 strbuf_addch(&dirpath
, '/');
657 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
661 if (pos
< active_nr
&&
662 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
663 strbuf_release(&dirpath
);
667 strbuf_release(&dirpath
);
668 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
669 !(empty_ok
&& is_empty_dir(path
));
672 static int was_tracked(const char *path
)
674 int pos
= cache_name_pos(path
, strlen(path
));
677 /* we have been tracking this path */
681 * Look for an unmerged entry for the path,
682 * specifically stage #2, which would indicate
683 * that "our" side before the merge started
684 * had the path tracked (and resulted in a conflict).
687 pos
< active_nr
&& !strcmp(path
, active_cache
[pos
]->name
);
689 if (ce_stage(active_cache
[pos
]) == 2)
694 static int would_lose_untracked(const char *path
)
696 return !was_tracked(path
) && file_exists(path
);
699 static int make_room_for_path(struct merge_options
*o
, const char *path
)
702 const char *msg
= _("failed to create path '%s'%s");
704 /* Unlink any D/F conflict files that are in the way */
705 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
706 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
707 size_t pathlen
= strlen(path
);
708 size_t df_pathlen
= strlen(df_path
);
709 if (df_pathlen
< pathlen
&&
710 path
[df_pathlen
] == '/' &&
711 strncmp(path
, df_path
, df_pathlen
) == 0) {
713 _("Removing %s to make room for subdirectory\n"),
716 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
722 /* Make sure leading directories are created */
723 status
= safe_create_leading_directories_const(path
);
725 if (status
== SCLD_EXISTS
)
726 /* something else exists */
727 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
728 return err(o
, msg
, path
, "");
732 * Do not unlink a file in the work tree if we are not
735 if (would_lose_untracked(path
))
736 return err(o
, _("refusing to lose untracked file at '%s'"),
739 /* Successful unlink is good.. */
742 /* .. and so is no existing file */
745 /* .. but not some other error (who really cares what?) */
746 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
749 static int update_file_flags(struct merge_options
*o
,
750 const struct object_id
*oid
,
762 enum object_type type
;
766 if (S_ISGITLINK(mode
)) {
768 * We may later decide to recursively descend into
769 * the submodule directory and update its index
770 * and/or work tree, but we do not do that now.
776 buf
= read_object_file(oid
, &type
, &size
);
778 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
779 if (type
!= OBJ_BLOB
) {
780 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
784 struct strbuf strbuf
= STRBUF_INIT
;
785 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
788 buf
= strbuf_detach(&strbuf
, NULL
);
792 if (make_room_for_path(o
, path
) < 0) {
796 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
802 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
804 ret
= err(o
, _("failed to open '%s': %s"),
805 path
, strerror(errno
));
808 write_in_full(fd
, buf
, size
);
810 } else if (S_ISLNK(mode
)) {
811 char *lnk
= xmemdupz(buf
, size
);
812 safe_create_leading_directories_const(path
);
814 if (symlink(lnk
, path
))
815 ret
= err(o
, _("failed to symlink '%s': %s"),
816 path
, strerror(errno
));
820 _("do not know what to do with %06o %s '%s'"),
821 mode
, oid_to_hex(oid
), path
);
826 if (!ret
&& update_cache
)
827 add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
831 static int update_file(struct merge_options
*o
,
833 const struct object_id
*oid
,
837 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
840 /* Low level file merging, update and removal */
842 struct merge_file_info
{
843 struct object_id oid
;
849 static int merge_3way(struct merge_options
*o
,
850 mmbuffer_t
*result_buf
,
851 const struct diff_filespec
*one
,
852 const struct diff_filespec
*a
,
853 const struct diff_filespec
*b
,
857 mmfile_t orig
, src1
, src2
;
858 struct ll_merge_options ll_opts
= {0};
859 char *base_name
, *name1
, *name2
;
862 ll_opts
.renormalize
= o
->renormalize
;
863 ll_opts
.xdl_opts
= o
->xdl_opts
;
866 ll_opts
.virtual_ancestor
= 1;
869 switch (o
->recursive_variant
) {
870 case MERGE_RECURSIVE_OURS
:
871 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
873 case MERGE_RECURSIVE_THEIRS
:
874 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
882 if (strcmp(a
->path
, b
->path
) ||
883 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
884 base_name
= o
->ancestor
== NULL
? NULL
:
885 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
886 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
887 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
889 base_name
= o
->ancestor
== NULL
? NULL
:
890 mkpathdup("%s", o
->ancestor
);
891 name1
= mkpathdup("%s", branch1
);
892 name2
= mkpathdup("%s", branch2
);
895 read_mmblob(&orig
, &one
->oid
);
896 read_mmblob(&src1
, &a
->oid
);
897 read_mmblob(&src2
, &b
->oid
);
899 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
900 &src1
, name1
, &src2
, name2
, &ll_opts
);
911 static int merge_file_1(struct merge_options
*o
,
912 const struct diff_filespec
*one
,
913 const struct diff_filespec
*a
,
914 const struct diff_filespec
*b
,
917 struct merge_file_info
*result
)
922 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
924 if (S_ISREG(a
->mode
)) {
925 result
->mode
= a
->mode
;
926 oidcpy(&result
->oid
, &a
->oid
);
928 result
->mode
= b
->mode
;
929 oidcpy(&result
->oid
, &b
->oid
);
932 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
938 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
939 result
->mode
= b
->mode
;
941 result
->mode
= a
->mode
;
942 if (b
->mode
!= one
->mode
) {
948 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
949 oidcpy(&result
->oid
, &b
->oid
);
950 else if (oid_eq(&b
->oid
, &one
->oid
))
951 oidcpy(&result
->oid
, &a
->oid
);
952 else if (S_ISREG(a
->mode
)) {
953 mmbuffer_t result_buf
;
954 int ret
= 0, merge_status
;
956 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
959 if ((merge_status
< 0) || !result_buf
.ptr
)
960 ret
= err(o
, _("Failed to execute internal merge"));
963 write_object_file(result_buf
.ptr
, result_buf
.size
,
964 blob_type
, &result
->oid
))
965 ret
= err(o
, _("Unable to add %s to database"),
968 free(result_buf
.ptr
);
971 result
->clean
= (merge_status
== 0);
972 } else if (S_ISGITLINK(a
->mode
)) {
973 result
->clean
= merge_submodule(&result
->oid
,
979 } else if (S_ISLNK(a
->mode
)) {
980 switch (o
->recursive_variant
) {
981 case MERGE_RECURSIVE_NORMAL
:
982 oidcpy(&result
->oid
, &a
->oid
);
983 if (!oid_eq(&a
->oid
, &b
->oid
))
986 case MERGE_RECURSIVE_OURS
:
987 oidcpy(&result
->oid
, &a
->oid
);
989 case MERGE_RECURSIVE_THEIRS
:
990 oidcpy(&result
->oid
, &b
->oid
);
994 die("BUG: unsupported object type in the tree");
1000 static int merge_file_special_markers(struct merge_options
*o
,
1001 const struct diff_filespec
*one
,
1002 const struct diff_filespec
*a
,
1003 const struct diff_filespec
*b
,
1004 const char *branch1
,
1005 const char *filename1
,
1006 const char *branch2
,
1007 const char *filename2
,
1008 struct merge_file_info
*mfi
)
1015 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1017 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1019 ret
= merge_file_1(o
, one
, a
, b
,
1020 side1
? side1
: branch1
,
1021 side2
? side2
: branch2
, mfi
);
1027 static int merge_file_one(struct merge_options
*o
,
1029 const struct object_id
*o_oid
, int o_mode
,
1030 const struct object_id
*a_oid
, int a_mode
,
1031 const struct object_id
*b_oid
, int b_mode
,
1032 const char *branch1
,
1033 const char *branch2
,
1034 struct merge_file_info
*mfi
)
1036 struct diff_filespec one
, a
, b
;
1038 one
.path
= a
.path
= b
.path
= (char *)path
;
1039 oidcpy(&one
.oid
, o_oid
);
1041 oidcpy(&a
.oid
, a_oid
);
1043 oidcpy(&b
.oid
, b_oid
);
1045 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
, mfi
);
1048 static int handle_change_delete(struct merge_options
*o
,
1049 const char *path
, const char *old_path
,
1050 const struct object_id
*o_oid
, int o_mode
,
1051 const struct object_id
*changed_oid
,
1053 const char *change_branch
,
1054 const char *delete_branch
,
1055 const char *change
, const char *change_past
)
1057 char *alt_path
= NULL
;
1058 const char *update_path
= path
;
1061 if (dir_in_way(path
, !o
->call_depth
, 0)) {
1062 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1065 if (o
->call_depth
) {
1067 * We cannot arbitrarily accept either a_sha or b_sha as
1068 * correct; since there is no true "middle point" between
1069 * them, simply reuse the base version for virtual merge base.
1071 ret
= remove_file_from_cache(path
);
1073 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1077 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1078 "and %s in %s. Version %s of %s left in tree."),
1079 change
, path
, delete_branch
, change_past
,
1080 change_branch
, change_branch
, path
);
1082 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1083 "and %s to %s in %s. Version %s of %s left in tree."),
1084 change
, old_path
, delete_branch
, change_past
, path
,
1085 change_branch
, change_branch
, path
);
1089 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1090 "and %s in %s. Version %s of %s left in tree at %s."),
1091 change
, path
, delete_branch
, change_past
,
1092 change_branch
, change_branch
, path
, alt_path
);
1094 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1095 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1096 change
, old_path
, delete_branch
, change_past
, path
,
1097 change_branch
, change_branch
, path
, alt_path
);
1101 * No need to call update_file() on path when change_branch ==
1102 * o->branch1 && !alt_path, since that would needlessly touch
1103 * path. We could call update_file_flags() with update_cache=0
1104 * and update_wd=0, but that's a no-op.
1106 if (change_branch
!= o
->branch1
|| alt_path
)
1107 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1114 static int conflict_rename_delete(struct merge_options
*o
,
1115 struct diff_filepair
*pair
,
1116 const char *rename_branch
,
1117 const char *delete_branch
)
1119 const struct diff_filespec
*orig
= pair
->one
;
1120 const struct diff_filespec
*dest
= pair
->two
;
1122 if (handle_change_delete(o
,
1123 o
->call_depth
? orig
->path
: dest
->path
,
1124 o
->call_depth
? NULL
: orig
->path
,
1125 &orig
->oid
, orig
->mode
,
1126 &dest
->oid
, dest
->mode
,
1127 rename_branch
, delete_branch
,
1128 _("rename"), _("renamed")))
1132 return remove_file_from_cache(dest
->path
);
1134 return update_stages(o
, dest
->path
, NULL
,
1135 rename_branch
== o
->branch1
? dest
: NULL
,
1136 rename_branch
== o
->branch1
? NULL
: dest
);
1139 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1140 struct stage_data
*entry
,
1143 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1144 unsigned mode
= entry
->stages
[stage
].mode
;
1145 if (mode
== 0 || is_null_oid(oid
))
1147 oidcpy(&target
->oid
, oid
);
1148 target
->mode
= mode
;
1152 static int handle_file(struct merge_options
*o
,
1153 struct diff_filespec
*rename
,
1155 struct rename_conflict_info
*ci
)
1157 char *dst_name
= rename
->path
;
1158 struct stage_data
*dst_entry
;
1159 const char *cur_branch
, *other_branch
;
1160 struct diff_filespec other
;
1161 struct diff_filespec
*add
;
1165 dst_entry
= ci
->dst_entry1
;
1166 cur_branch
= ci
->branch1
;
1167 other_branch
= ci
->branch2
;
1169 dst_entry
= ci
->dst_entry2
;
1170 cur_branch
= ci
->branch2
;
1171 other_branch
= ci
->branch1
;
1174 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1176 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1177 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1180 remove_file(o
, 0, rename
->path
, 0);
1181 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1183 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1184 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1185 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1186 rename
->path
, other_branch
, dst_name
);
1189 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1190 ; /* fall through, do allow dst_name to be released */
1191 else if (stage
== 2)
1192 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1194 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1196 if (dst_name
!= rename
->path
)
1202 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1203 struct rename_conflict_info
*ci
)
1205 /* One file was renamed in both branches, but to different names. */
1206 struct diff_filespec
*one
= ci
->pair1
->one
;
1207 struct diff_filespec
*a
= ci
->pair1
->two
;
1208 struct diff_filespec
*b
= ci
->pair2
->two
;
1210 output(o
, 1, _("CONFLICT (rename/rename): "
1211 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1212 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1213 one
->path
, a
->path
, ci
->branch1
,
1214 one
->path
, b
->path
, ci
->branch2
,
1215 o
->call_depth
? _(" (left unresolved)") : "");
1216 if (o
->call_depth
) {
1217 struct merge_file_info mfi
;
1218 struct diff_filespec other
;
1219 struct diff_filespec
*add
;
1220 if (merge_file_one(o
, one
->path
,
1221 &one
->oid
, one
->mode
,
1224 ci
->branch1
, ci
->branch2
, &mfi
))
1228 * FIXME: For rename/add-source conflicts (if we could detect
1229 * such), this is wrong. We should instead find a unique
1230 * pathname and then either rename the add-source file to that
1231 * unique path, or use that unique path instead of src here.
1233 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1237 * Above, we put the merged content at the merge-base's
1238 * path. Now we usually need to delete both a->path and
1239 * b->path. However, the rename on each side of the merge
1240 * could also be involved in a rename/add conflict. In
1241 * such cases, we should keep the added file around,
1242 * resolving the conflict at that path in its favor.
1244 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1246 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1250 remove_file_from_cache(a
->path
);
1251 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1253 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1257 remove_file_from_cache(b
->path
);
1258 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1264 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1265 struct rename_conflict_info
*ci
)
1267 /* Two files, a & b, were renamed to the same thing, c. */
1268 struct diff_filespec
*a
= ci
->pair1
->one
;
1269 struct diff_filespec
*b
= ci
->pair2
->one
;
1270 struct diff_filespec
*c1
= ci
->pair1
->two
;
1271 struct diff_filespec
*c2
= ci
->pair2
->two
;
1272 char *path
= c1
->path
; /* == c2->path */
1273 struct merge_file_info mfi_c1
;
1274 struct merge_file_info mfi_c2
;
1277 output(o
, 1, _("CONFLICT (rename/rename): "
1278 "Rename %s->%s in %s. "
1279 "Rename %s->%s in %s"),
1280 a
->path
, c1
->path
, ci
->branch1
,
1281 b
->path
, c2
->path
, ci
->branch2
);
1283 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1284 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1286 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1287 o
->branch1
, c1
->path
,
1288 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1289 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1290 o
->branch1
, ci
->ren2_other
.path
,
1291 o
->branch2
, c2
->path
, &mfi_c2
))
1294 if (o
->call_depth
) {
1296 * If mfi_c1.clean && mfi_c2.clean, then it might make
1297 * sense to do a two-way merge of those results. But, I
1298 * think in all cases, it makes sense to have the virtual
1299 * merge base just undo the renames; they can be detected
1300 * again later for the non-recursive merge.
1302 remove_file(o
, 0, path
, 0);
1303 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1305 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1308 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1309 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1310 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1311 a
->path
, new_path1
, b
->path
, new_path2
);
1312 remove_file(o
, 0, path
, 0);
1313 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1315 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1325 * Get information of all renames which occurred between 'o_tree' and
1326 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
1327 * 'b_tree') to be able to associate the correct cache entries with
1328 * the rename information. 'tree' is always equal to either a_tree or b_tree.
1330 static struct string_list
*get_renames(struct merge_options
*o
,
1332 struct tree
*o_tree
,
1333 struct tree
*a_tree
,
1334 struct tree
*b_tree
,
1335 struct string_list
*entries
)
1338 struct string_list
*renames
;
1339 struct diff_options opts
;
1341 renames
= xcalloc(1, sizeof(struct string_list
));
1342 if (!o
->detect_rename
)
1346 opts
.flags
.recursive
= 1;
1347 opts
.flags
.rename_empty
= 0;
1348 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1349 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
1350 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
1352 opts
.rename_score
= o
->rename_score
;
1353 opts
.show_rename_progress
= o
->show_rename_progress
;
1354 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1355 diff_setup_done(&opts
);
1356 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1357 diffcore_std(&opts
);
1358 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
1359 o
->needed_rename_limit
= opts
.needed_rename_limit
;
1360 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
1361 struct string_list_item
*item
;
1363 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
1365 if (pair
->status
!= 'R') {
1366 diff_free_filepair(pair
);
1369 re
= xmalloc(sizeof(*re
));
1372 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
1374 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
1375 o_tree
, a_tree
, b_tree
, entries
);
1377 re
->src_entry
= item
->util
;
1379 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
1381 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
1382 o_tree
, a_tree
, b_tree
, entries
);
1384 re
->dst_entry
= item
->util
;
1385 item
= string_list_insert(renames
, pair
->one
->path
);
1388 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1389 diff_queued_diff
.nr
= 0;
1394 static int process_renames(struct merge_options
*o
,
1395 struct string_list
*a_renames
,
1396 struct string_list
*b_renames
)
1398 int clean_merge
= 1, i
, j
;
1399 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1400 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1401 const struct rename
*sre
;
1403 for (i
= 0; i
< a_renames
->nr
; i
++) {
1404 sre
= a_renames
->items
[i
].util
;
1405 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1408 for (i
= 0; i
< b_renames
->nr
; i
++) {
1409 sre
= b_renames
->items
[i
].util
;
1410 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1414 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1415 struct string_list
*renames1
, *renames2Dst
;
1416 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1417 const char *branch1
, *branch2
;
1418 const char *ren1_src
, *ren1_dst
;
1419 struct string_list_item
*lookup
;
1421 if (i
>= a_renames
->nr
) {
1422 ren2
= b_renames
->items
[j
++].util
;
1423 } else if (j
>= b_renames
->nr
) {
1424 ren1
= a_renames
->items
[i
++].util
;
1426 int compare
= strcmp(a_renames
->items
[i
].string
,
1427 b_renames
->items
[j
].string
);
1429 ren1
= a_renames
->items
[i
++].util
;
1431 ren2
= b_renames
->items
[j
++].util
;
1434 /* TODO: refactor, so that 1/2 are not needed */
1436 renames1
= a_renames
;
1437 renames2Dst
= &b_by_dst
;
1438 branch1
= o
->branch1
;
1439 branch2
= o
->branch2
;
1441 renames1
= b_renames
;
1442 renames2Dst
= &a_by_dst
;
1443 branch1
= o
->branch2
;
1444 branch2
= o
->branch1
;
1448 if (ren1
->processed
)
1450 ren1
->processed
= 1;
1451 ren1
->dst_entry
->processed
= 1;
1452 /* BUG: We should only mark src_entry as processed if we
1453 * are not dealing with a rename + add-source case.
1455 ren1
->src_entry
->processed
= 1;
1457 ren1_src
= ren1
->pair
->one
->path
;
1458 ren1_dst
= ren1
->pair
->two
->path
;
1461 /* One file renamed on both sides */
1462 const char *ren2_src
= ren2
->pair
->one
->path
;
1463 const char *ren2_dst
= ren2
->pair
->two
->path
;
1464 enum rename_type rename_type
;
1465 if (strcmp(ren1_src
, ren2_src
) != 0)
1466 die("BUG: ren1_src != ren2_src");
1467 ren2
->dst_entry
->processed
= 1;
1468 ren2
->processed
= 1;
1469 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1470 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1473 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1474 /* BUG: We should only remove ren1_src in
1475 * the base stage (think of rename +
1476 * add-source cases).
1478 remove_file(o
, 1, ren1_src
, 1);
1479 update_entry(ren1
->dst_entry
,
1484 setup_rename_conflict_info(rename_type
,
1494 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1495 /* Two different files renamed to the same thing */
1497 ren2
= lookup
->util
;
1498 ren2_dst
= ren2
->pair
->two
->path
;
1499 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1500 die("BUG: ren1_dst != ren2_dst");
1503 ren2
->processed
= 1;
1505 * BUG: We should only mark src_entry as processed
1506 * if we are not dealing with a rename + add-source
1509 ren2
->src_entry
->processed
= 1;
1511 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1523 /* Renamed in 1, maybe changed in 2 */
1524 /* we only use sha1 and mode of these */
1525 struct diff_filespec src_other
, dst_other
;
1529 * unpack_trees loads entries from common-commit
1530 * into stage 1, from head-commit into stage 2, and
1531 * from merge-commit into stage 3. We keep track
1532 * of which side corresponds to the rename.
1534 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1535 int other_stage
= a_renames
== renames1
? 3 : 2;
1537 /* BUG: We should only remove ren1_src in the base
1538 * stage and in other_stage (think of rename +
1541 remove_file(o
, 1, ren1_src
,
1542 renamed_stage
== 2 || !was_tracked(ren1_src
));
1544 oidcpy(&src_other
.oid
,
1545 &ren1
->src_entry
->stages
[other_stage
].oid
);
1546 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1547 oidcpy(&dst_other
.oid
,
1548 &ren1
->dst_entry
->stages
[other_stage
].oid
);
1549 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1552 if (oid_eq(&src_other
.oid
, &null_oid
)) {
1553 setup_rename_conflict_info(RENAME_DELETE
,
1563 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1564 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
1566 * Added file on the other side identical to
1567 * the file being renamed: clean merge.
1568 * Also, there is no need to overwrite the
1569 * file already in the working copy, so call
1570 * update_file_flags() instead of
1573 if (update_file_flags(o
,
1574 &ren1
->pair
->two
->oid
,
1575 ren1
->pair
->two
->mode
,
1577 1, /* update_cache */
1580 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
1583 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1585 ren1_src
, ren1_dst
, branch1
,
1587 if (o
->call_depth
) {
1588 struct merge_file_info mfi
;
1589 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
1590 &ren1
->pair
->two
->oid
,
1591 ren1
->pair
->two
->mode
,
1594 branch1
, branch2
, &mfi
)) {
1596 goto cleanup_and_return
;
1598 output(o
, 1, _("Adding merged %s"), ren1_dst
);
1599 if (update_file(o
, 0, &mfi
.oid
,
1600 mfi
.mode
, ren1_dst
))
1604 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1605 output(o
, 1, _("Adding as %s instead"), new_path
);
1606 if (update_file(o
, 0, &dst_other
.oid
,
1607 dst_other
.mode
, new_path
))
1614 if (clean_merge
< 0)
1615 goto cleanup_and_return
;
1617 struct diff_filespec
*one
, *a
, *b
;
1618 src_other
.path
= (char *)ren1_src
;
1620 one
= ren1
->pair
->one
;
1621 if (a_renames
== renames1
) {
1622 a
= ren1
->pair
->two
;
1625 b
= ren1
->pair
->two
;
1628 update_entry(ren1
->dst_entry
, one
, a
, b
);
1629 setup_rename_conflict_info(RENAME_NORMAL
,
1643 string_list_clear(&a_by_dst
, 0);
1644 string_list_clear(&b_by_dst
, 0);
1649 struct rename_info
{
1650 struct string_list
*head_renames
;
1651 struct string_list
*merge_renames
;
1654 static int handle_renames(struct merge_options
*o
,
1655 struct tree
*common
,
1658 struct string_list
*entries
,
1659 struct rename_info
*ri
)
1661 ri
->head_renames
= get_renames(o
, head
, common
, head
, merge
, entries
);
1662 ri
->merge_renames
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1663 return process_renames(o
, ri
->head_renames
, ri
->merge_renames
);
1666 static void cleanup_renames(struct rename_info
*re_info
)
1668 string_list_clear(re_info
->head_renames
, 0);
1669 string_list_clear(re_info
->merge_renames
, 0);
1671 free(re_info
->head_renames
);
1672 free(re_info
->merge_renames
);
1675 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
1677 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
1680 static int read_oid_strbuf(struct merge_options
*o
,
1681 const struct object_id
*oid
, struct strbuf
*dst
)
1684 enum object_type type
;
1686 buf
= read_object_file(oid
, &type
, &size
);
1688 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
1689 if (type
!= OBJ_BLOB
) {
1691 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
1693 strbuf_attach(dst
, buf
, size
, size
+ 1);
1697 static int blob_unchanged(struct merge_options
*opt
,
1698 const struct object_id
*o_oid
,
1700 const struct object_id
*a_oid
,
1702 int renormalize
, const char *path
)
1704 struct strbuf o
= STRBUF_INIT
;
1705 struct strbuf a
= STRBUF_INIT
;
1706 int ret
= 0; /* assume changed for safety */
1708 if (a_mode
!= o_mode
)
1710 if (oid_eq(o_oid
, a_oid
))
1715 assert(o_oid
&& a_oid
);
1716 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
1719 * Note: binary | is used so that both renormalizations are
1720 * performed. Comparison can be skipped if both files are
1721 * unchanged since their sha1s have already been compared.
1723 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
1724 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
1725 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1733 static int handle_modify_delete(struct merge_options
*o
,
1735 struct object_id
*o_oid
, int o_mode
,
1736 struct object_id
*a_oid
, int a_mode
,
1737 struct object_id
*b_oid
, int b_mode
)
1739 const char *modify_branch
, *delete_branch
;
1740 struct object_id
*changed_oid
;
1744 modify_branch
= o
->branch1
;
1745 delete_branch
= o
->branch2
;
1746 changed_oid
= a_oid
;
1747 changed_mode
= a_mode
;
1749 modify_branch
= o
->branch2
;
1750 delete_branch
= o
->branch1
;
1751 changed_oid
= b_oid
;
1752 changed_mode
= b_mode
;
1755 return handle_change_delete(o
,
1758 changed_oid
, changed_mode
,
1759 modify_branch
, delete_branch
,
1760 _("modify"), _("modified"));
1763 static int merge_content(struct merge_options
*o
,
1765 struct object_id
*o_oid
, int o_mode
,
1766 struct object_id
*a_oid
, int a_mode
,
1767 struct object_id
*b_oid
, int b_mode
,
1768 struct rename_conflict_info
*rename_conflict_info
)
1770 const char *reason
= _("content");
1771 const char *path1
= NULL
, *path2
= NULL
;
1772 struct merge_file_info mfi
;
1773 struct diff_filespec one
, a
, b
;
1774 unsigned df_conflict_remains
= 0;
1777 reason
= _("add/add");
1778 o_oid
= (struct object_id
*)&null_oid
;
1780 one
.path
= a
.path
= b
.path
= (char *)path
;
1781 oidcpy(&one
.oid
, o_oid
);
1783 oidcpy(&a
.oid
, a_oid
);
1785 oidcpy(&b
.oid
, b_oid
);
1788 if (rename_conflict_info
) {
1789 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1791 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1792 pair1
->two
->path
: pair1
->one
->path
;
1793 /* If rename_conflict_info->pair2 != NULL, we are in
1794 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1797 path2
= (rename_conflict_info
->pair2
||
1798 o
->branch2
== rename_conflict_info
->branch1
) ?
1799 pair1
->two
->path
: pair1
->one
->path
;
1801 if (dir_in_way(path
, !o
->call_depth
,
1802 S_ISGITLINK(pair1
->two
->mode
)))
1803 df_conflict_remains
= 1;
1805 if (merge_file_special_markers(o
, &one
, &a
, &b
,
1807 o
->branch2
, path2
, &mfi
))
1810 if (mfi
.clean
&& !df_conflict_remains
&&
1811 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
1812 int path_renamed_outside_HEAD
;
1813 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
1815 * The content merge resulted in the same file contents we
1816 * already had. We can return early if those file contents
1817 * are recorded at the correct path (which may not be true
1818 * if the merge involves a rename).
1820 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1821 if (!path_renamed_outside_HEAD
) {
1822 add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
1823 0, (!o
->call_depth
), 0);
1827 output(o
, 2, _("Auto-merging %s"), path
);
1830 if (S_ISGITLINK(mfi
.mode
))
1831 reason
= _("submodule");
1832 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
1834 if (rename_conflict_info
&& !df_conflict_remains
)
1835 if (update_stages(o
, path
, &one
, &a
, &b
))
1839 if (df_conflict_remains
) {
1841 if (o
->call_depth
) {
1842 remove_file_from_cache(path
);
1845 if (update_stages(o
, path
, &one
, &a
, &b
))
1848 int file_from_stage2
= was_tracked(path
);
1849 struct diff_filespec merged
;
1850 oidcpy(&merged
.oid
, &mfi
.oid
);
1851 merged
.mode
= mfi
.mode
;
1853 if (update_stages(o
, path
, NULL
,
1854 file_from_stage2
? &merged
: NULL
,
1855 file_from_stage2
? NULL
: &merged
))
1860 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1861 output(o
, 1, _("Adding as %s instead"), new_path
);
1862 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
1868 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
1873 /* Per entry merge function */
1874 static int process_entry(struct merge_options
*o
,
1875 const char *path
, struct stage_data
*entry
)
1877 int clean_merge
= 1;
1878 int normalize
= o
->renormalize
;
1879 unsigned o_mode
= entry
->stages
[1].mode
;
1880 unsigned a_mode
= entry
->stages
[2].mode
;
1881 unsigned b_mode
= entry
->stages
[3].mode
;
1882 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
1883 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
1884 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
1886 entry
->processed
= 1;
1887 if (entry
->rename_conflict_info
) {
1888 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1889 switch (conflict_info
->rename_type
) {
1891 case RENAME_ONE_FILE_TO_ONE
:
1892 clean_merge
= merge_content(o
, path
,
1893 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1898 if (conflict_rename_delete(o
,
1899 conflict_info
->pair1
,
1900 conflict_info
->branch1
,
1901 conflict_info
->branch2
))
1904 case RENAME_ONE_FILE_TO_TWO
:
1906 if (conflict_rename_rename_1to2(o
, conflict_info
))
1909 case RENAME_TWO_FILES_TO_ONE
:
1911 if (conflict_rename_rename_2to1(o
, conflict_info
))
1915 entry
->processed
= 0;
1918 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
1919 /* Case A: Deleted in one */
1920 if ((!a_oid
&& !b_oid
) ||
1921 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
1922 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
1923 /* Deleted in both or deleted in one and
1924 * unchanged in the other */
1926 output(o
, 2, _("Removing %s"), path
);
1927 /* do not touch working file if it did not exist */
1928 remove_file(o
, 1, path
, !a_oid
);
1930 /* Modify/delete; deleted side may have put a directory in the way */
1932 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
1933 a_oid
, a_mode
, b_oid
, b_mode
))
1936 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
1937 (!o_oid
&& !a_oid
&& b_oid
)) {
1938 /* Case B: Added in one. */
1939 /* [nothing|directory] -> ([nothing|directory], file) */
1941 const char *add_branch
;
1942 const char *other_branch
;
1944 const struct object_id
*oid
;
1948 add_branch
= o
->branch1
;
1949 other_branch
= o
->branch2
;
1952 conf
= _("file/directory");
1954 add_branch
= o
->branch2
;
1955 other_branch
= o
->branch1
;
1958 conf
= _("directory/file");
1960 if (dir_in_way(path
,
1961 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
1963 char *new_path
= unique_path(o
, path
, add_branch
);
1965 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1967 conf
, path
, other_branch
, path
, new_path
);
1968 if (update_file(o
, 0, oid
, mode
, new_path
))
1970 else if (o
->call_depth
)
1971 remove_file_from_cache(path
);
1974 output(o
, 2, _("Adding %s"), path
);
1975 /* do not overwrite file if already present */
1976 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
1979 } else if (a_oid
&& b_oid
) {
1980 /* Case C: Added in both (check for same permissions) and */
1981 /* case D: Modified in both, but differently. */
1982 clean_merge
= merge_content(o
, path
,
1983 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1985 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
1987 * this entry was deleted altogether. a_mode == 0 means
1988 * we had that path and want to actively remove it.
1990 remove_file(o
, 1, path
, !a_mode
);
1992 die("BUG: fatal merge failure, shouldn't happen.");
1997 int merge_trees(struct merge_options
*o
,
2000 struct tree
*common
,
2001 struct tree
**result
)
2005 if (o
->subtree_shift
) {
2006 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
2007 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
2010 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
2011 struct strbuf sb
= STRBUF_INIT
;
2013 if (!o
->call_depth
&& index_has_changes(&sb
)) {
2014 err(o
, _("Dirty index: cannot merge (dirty: %s)"),
2018 output(o
, 0, _("Already up to date!"));
2023 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
2026 if (show(o
, 4) || o
->call_depth
)
2027 err(o
, _("merging of trees %s and %s failed"),
2028 oid_to_hex(&head
->object
.oid
),
2029 oid_to_hex(&merge
->object
.oid
));
2033 if (unmerged_cache()) {
2034 struct string_list
*entries
;
2035 struct rename_info re_info
;
2038 * Only need the hashmap while processing entries, so
2039 * initialize it here and free it when we are done running
2040 * through the entries. Keeping it in the merge_options as
2041 * opposed to decaring a local hashmap is for convenience
2042 * so that we don't have to pass it to around.
2044 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
2045 get_files_dirs(o
, head
);
2046 get_files_dirs(o
, merge
);
2048 entries
= get_unmerged();
2049 clean
= handle_renames(o
, common
, head
, merge
, entries
,
2051 record_df_conflict_files(o
, entries
);
2054 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
2055 const char *path
= entries
->items
[i
].string
;
2056 struct stage_data
*e
= entries
->items
[i
].util
;
2057 if (!e
->processed
) {
2058 int ret
= process_entry(o
, path
, e
);
2067 for (i
= 0; i
< entries
->nr
; i
++) {
2068 struct stage_data
*e
= entries
->items
[i
].util
;
2070 die("BUG: unprocessed path??? %s",
2071 entries
->items
[i
].string
);
2075 cleanup_renames(&re_info
);
2077 string_list_clear(entries
, 1);
2080 hashmap_free(&o
->current_file_dir_set
, 1);
2088 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
2094 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
2096 struct commit_list
*next
= NULL
, *current
, *backup
;
2097 for (current
= list
; current
; current
= backup
) {
2098 backup
= current
->next
;
2099 current
->next
= next
;
2106 * Merge the commits h1 and h2, return the resulting virtual
2107 * commit object and a flag indicating the cleanness of the merge.
2109 int merge_recursive(struct merge_options
*o
,
2112 struct commit_list
*ca
,
2113 struct commit
**result
)
2115 struct commit_list
*iter
;
2116 struct commit
*merged_common_ancestors
;
2117 struct tree
*mrtree
;
2121 output(o
, 4, _("Merging:"));
2122 output_commit_title(o
, h1
);
2123 output_commit_title(o
, h2
);
2127 ca
= get_merge_bases(h1
, h2
);
2128 ca
= reverse_commit_list(ca
);
2132 unsigned cnt
= commit_list_count(ca
);
2134 output(o
, 5, Q_("found %u common ancestor:",
2135 "found %u common ancestors:", cnt
), cnt
);
2136 for (iter
= ca
; iter
; iter
= iter
->next
)
2137 output_commit_title(o
, iter
->item
);
2140 merged_common_ancestors
= pop_commit(&ca
);
2141 if (merged_common_ancestors
== NULL
) {
2142 /* if there is no common ancestor, use an empty tree */
2145 tree
= lookup_tree(the_hash_algo
->empty_tree
);
2146 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
2149 for (iter
= ca
; iter
; iter
= iter
->next
) {
2150 const char *saved_b1
, *saved_b2
;
2153 * When the merge fails, the result contains files
2154 * with conflict markers. The cleanness flag is
2155 * ignored (unless indicating an error), it was never
2156 * actually used, as result of merge_trees has always
2157 * overwritten it: the committed "conflicts" were
2161 saved_b1
= o
->branch1
;
2162 saved_b2
= o
->branch2
;
2163 o
->branch1
= "Temporary merge branch 1";
2164 o
->branch2
= "Temporary merge branch 2";
2165 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
2166 NULL
, &merged_common_ancestors
) < 0)
2168 o
->branch1
= saved_b1
;
2169 o
->branch2
= saved_b2
;
2172 if (!merged_common_ancestors
)
2173 return err(o
, _("merge returned no commit"));
2180 o
->ancestor
= "merged common ancestors";
2181 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
2188 if (o
->call_depth
) {
2189 *result
= make_virtual_commit(mrtree
, "merged tree");
2190 commit_list_insert(h1
, &(*result
)->parents
);
2191 commit_list_insert(h2
, &(*result
)->parents
->next
);
2194 if (!o
->call_depth
&& o
->buffer_output
< 2)
2195 strbuf_release(&o
->obuf
);
2197 diff_warn_rename_limit("merge.renamelimit",
2198 o
->needed_rename_limit
, 0);
2202 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
2204 struct object
*object
;
2206 object
= deref_tag(parse_object(oid
), name
, strlen(name
));
2209 if (object
->type
== OBJ_TREE
)
2210 return make_virtual_commit((struct tree
*)object
, name
);
2211 if (object
->type
!= OBJ_COMMIT
)
2213 if (parse_commit((struct commit
*)object
))
2215 return (struct commit
*)object
;
2218 int merge_recursive_generic(struct merge_options
*o
,
2219 const struct object_id
*head
,
2220 const struct object_id
*merge
,
2222 const struct object_id
**base_list
,
2223 struct commit
**result
)
2226 struct lock_file lock
= LOCK_INIT
;
2227 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
2228 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
2229 struct commit_list
*ca
= NULL
;
2233 for (i
= 0; i
< num_base_list
; ++i
) {
2234 struct commit
*base
;
2235 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
2236 return err(o
, _("Could not parse object '%s'"),
2237 oid_to_hex(base_list
[i
]));
2238 commit_list_insert(base
, &ca
);
2242 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
2243 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
2246 rollback_lock_file(&lock
);
2250 if (write_locked_index(&the_index
, &lock
,
2251 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
2252 return err(o
, _("Unable to write index."));
2254 return clean
? 0 : 1;
2257 static void merge_recursive_config(struct merge_options
*o
)
2259 git_config_get_int("merge.verbosity", &o
->verbosity
);
2260 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
2261 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
2262 git_config(git_xmerge_config
, NULL
);
2265 void init_merge_options(struct merge_options
*o
)
2267 const char *merge_verbosity
;
2268 memset(o
, 0, sizeof(struct merge_options
));
2270 o
->buffer_output
= 1;
2271 o
->diff_rename_limit
= -1;
2272 o
->merge_rename_limit
= -1;
2274 o
->detect_rename
= 1;
2275 merge_recursive_config(o
);
2276 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
2277 if (merge_verbosity
)
2278 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
2279 if (o
->verbosity
>= 5)
2280 o
->buffer_output
= 0;
2281 strbuf_init(&o
->obuf
, 0);
2282 string_list_init(&o
->df_conflict_file_set
, 1);
2285 int parse_merge_opt(struct merge_options
*o
, const char *s
)
2291 if (!strcmp(s
, "ours"))
2292 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
2293 else if (!strcmp(s
, "theirs"))
2294 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
2295 else if (!strcmp(s
, "subtree"))
2296 o
->subtree_shift
= "";
2297 else if (skip_prefix(s
, "subtree=", &arg
))
2298 o
->subtree_shift
= arg
;
2299 else if (!strcmp(s
, "patience"))
2300 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
2301 else if (!strcmp(s
, "histogram"))
2302 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
2303 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
2304 long value
= parse_algorithm_value(arg
);
2307 /* clear out previous settings */
2308 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
2309 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
2310 o
->xdl_opts
|= value
;
2312 else if (!strcmp(s
, "ignore-space-change"))
2313 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
2314 else if (!strcmp(s
, "ignore-all-space"))
2315 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
2316 else if (!strcmp(s
, "ignore-space-at-eol"))
2317 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
2318 else if (!strcmp(s
, "ignore-cr-at-eol"))
2319 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
2320 else if (!strcmp(s
, "renormalize"))
2322 else if (!strcmp(s
, "no-renormalize"))
2324 else if (!strcmp(s
, "no-renames"))
2325 o
->detect_rename
= 0;
2326 else if (!strcmp(s
, "find-renames")) {
2327 o
->detect_rename
= 1;
2328 o
->rename_score
= 0;
2330 else if (skip_prefix(s
, "find-renames=", &arg
) ||
2331 skip_prefix(s
, "rename-threshold=", &arg
)) {
2332 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
2334 o
->detect_rename
= 1;