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 struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
55 struct dir_rename_entry key
;
59 hashmap_entry_init(&key
, strhash(dir
));
61 return hashmap_get(hashmap
, &key
, NULL
);
64 static int dir_rename_cmp(const void *unused_cmp_data
,
66 const void *entry_or_key
,
67 const void *unused_keydata
)
69 const struct dir_rename_entry
*e1
= entry
;
70 const struct dir_rename_entry
*e2
= entry_or_key
;
72 return strcmp(e1
->dir
, e2
->dir
);
75 static void dir_rename_init(struct hashmap
*map
)
77 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
80 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
83 hashmap_entry_init(entry
, strhash(directory
));
84 entry
->dir
= directory
;
85 entry
->non_unique_new_dir
= 0;
86 strbuf_init(&entry
->new_dir
, 0);
87 string_list_init(&entry
->possible_new_dirs
, 0);
90 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
93 struct collision_entry key
;
95 hashmap_entry_init(&key
, strhash(target_file
));
96 key
.target_file
= target_file
;
97 return hashmap_get(hashmap
, &key
, NULL
);
100 static int collision_cmp(void *unused_cmp_data
,
101 const struct collision_entry
*e1
,
102 const struct collision_entry
*e2
,
103 const void *unused_keydata
)
105 return strcmp(e1
->target_file
, e2
->target_file
);
108 static void collision_init(struct hashmap
*map
)
110 hashmap_init(map
, (hashmap_cmp_fn
) collision_cmp
, NULL
, 0);
113 static void flush_output(struct merge_options
*o
)
115 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
116 fputs(o
->obuf
.buf
, stdout
);
117 strbuf_reset(&o
->obuf
);
121 static int err(struct merge_options
*o
, const char *err
, ...)
125 if (o
->buffer_output
< 2)
128 strbuf_complete(&o
->obuf
, '\n');
129 strbuf_addstr(&o
->obuf
, "error: ");
131 va_start(params
, err
);
132 strbuf_vaddf(&o
->obuf
, err
, params
);
134 if (o
->buffer_output
> 1)
135 strbuf_addch(&o
->obuf
, '\n');
137 error("%s", o
->obuf
.buf
);
138 strbuf_reset(&o
->obuf
);
144 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
145 const char *subtree_shift
)
147 struct object_id shifted
;
149 if (!*subtree_shift
) {
150 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
152 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
155 if (!oidcmp(&two
->object
.oid
, &shifted
))
157 return lookup_tree(&shifted
);
160 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
162 struct commit
*commit
= alloc_commit_node();
164 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
166 commit
->object
.parsed
= 1;
171 * Since we use get_tree_entry(), which does not put the read object into
172 * the object pool, we cannot rely on a == b.
174 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
178 return a
&& b
&& oidcmp(a
, b
) == 0;
184 RENAME_ONE_FILE_TO_ONE
,
185 RENAME_ONE_FILE_TO_TWO
,
186 RENAME_TWO_FILES_TO_ONE
189 struct rename_conflict_info
{
190 enum rename_type rename_type
;
191 struct diff_filepair
*pair1
;
192 struct diff_filepair
*pair2
;
195 struct stage_data
*dst_entry1
;
196 struct stage_data
*dst_entry2
;
197 struct diff_filespec ren1_other
;
198 struct diff_filespec ren2_other
;
202 * Since we want to write the index eventually, we cannot reuse the index
203 * for these (temporary) data.
208 struct object_id oid
;
210 struct rename_conflict_info
*rename_conflict_info
;
211 unsigned processed
:1;
214 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
215 struct diff_filepair
*pair1
,
216 struct diff_filepair
*pair2
,
219 struct stage_data
*dst_entry1
,
220 struct stage_data
*dst_entry2
,
221 struct merge_options
*o
,
222 struct stage_data
*src_entry1
,
223 struct stage_data
*src_entry2
)
225 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
226 ci
->rename_type
= rename_type
;
228 ci
->branch1
= branch1
;
229 ci
->branch2
= branch2
;
231 ci
->dst_entry1
= dst_entry1
;
232 dst_entry1
->rename_conflict_info
= ci
;
233 dst_entry1
->processed
= 0;
235 assert(!pair2
== !dst_entry2
);
237 ci
->dst_entry2
= dst_entry2
;
239 dst_entry2
->rename_conflict_info
= ci
;
242 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
244 * For each rename, there could have been
245 * modifications on the side of history where that
246 * file was not renamed.
248 int ostage1
= o
->branch1
== branch1
? 3 : 2;
249 int ostage2
= ostage1
^ 1;
251 ci
->ren1_other
.path
= pair1
->one
->path
;
252 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
253 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
255 ci
->ren2_other
.path
= pair2
->one
->path
;
256 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
257 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
261 static int show(struct merge_options
*o
, int v
)
263 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
266 __attribute__((format (printf
, 3, 4)))
267 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
274 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
277 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
280 strbuf_addch(&o
->obuf
, '\n');
281 if (!o
->buffer_output
)
285 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
287 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
289 strbuf_addf(&o
->obuf
, "virtual %s\n",
290 merge_remote_util(commit
)->name
);
292 strbuf_add_unique_abbrev(&o
->obuf
, &commit
->object
.oid
,
294 strbuf_addch(&o
->obuf
, ' ');
295 if (parse_commit(commit
) != 0)
296 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
299 const char *msg
= get_commit_buffer(commit
, NULL
);
300 int len
= find_commit_subject(msg
, &title
);
302 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
303 unuse_commit_buffer(commit
, msg
);
309 static int add_cacheinfo(struct merge_options
*o
,
310 unsigned int mode
, const struct object_id
*oid
,
311 const char *path
, int stage
, int refresh
, int options
)
313 struct cache_entry
*ce
;
316 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
318 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
320 ret
= add_cache_entry(ce
, options
);
322 struct cache_entry
*nce
;
324 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
326 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
328 ret
= add_cache_entry(nce
, options
);
333 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
336 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
339 static int git_merge_trees(int index_only
,
345 struct tree_desc t
[3];
346 struct unpack_trees_options opts
;
348 memset(&opts
, 0, sizeof(opts
));
355 opts
.fn
= threeway_merge
;
356 opts
.src_index
= &the_index
;
357 opts
.dst_index
= &the_index
;
358 setup_unpack_trees_porcelain(&opts
, "merge");
360 init_tree_desc_from_tree(t
+0, common
);
361 init_tree_desc_from_tree(t
+1, head
);
362 init_tree_desc_from_tree(t
+2, merge
);
364 rc
= unpack_trees(3, t
, &opts
);
365 cache_tree_free(&active_cache_tree
);
369 struct tree
*write_tree_from_memory(struct merge_options
*o
)
371 struct tree
*result
= NULL
;
373 if (unmerged_cache()) {
375 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
376 for (i
= 0; i
< active_nr
; i
++) {
377 const struct cache_entry
*ce
= active_cache
[i
];
379 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
380 (int)ce_namelen(ce
), ce
->name
);
382 die("BUG: unmerged index entries in merge-recursive.c");
385 if (!active_cache_tree
)
386 active_cache_tree
= cache_tree();
388 if (!cache_tree_fully_valid(active_cache_tree
) &&
389 cache_tree_update(&the_index
, 0) < 0) {
390 err(o
, _("error building trees"));
394 result
= lookup_tree(&active_cache_tree
->oid
);
399 static int save_files_dirs(const struct object_id
*oid
,
400 struct strbuf
*base
, const char *path
,
401 unsigned int mode
, int stage
, void *context
)
403 struct path_hashmap_entry
*entry
;
404 int baselen
= base
->len
;
405 struct merge_options
*o
= context
;
407 strbuf_addstr(base
, path
);
409 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
410 hashmap_entry_init(entry
, path_hash(entry
->path
));
411 hashmap_add(&o
->current_file_dir_set
, entry
);
413 strbuf_setlen(base
, baselen
);
414 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
417 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
419 struct pathspec match_all
;
420 memset(&match_all
, 0, sizeof(match_all
));
421 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
425 * Returns an index_entry instance which doesn't have to correspond to
426 * a real cache entry in Git's index.
428 static struct stage_data
*insert_stage_data(const char *path
,
429 struct tree
*o
, struct tree
*a
, struct tree
*b
,
430 struct string_list
*entries
)
432 struct string_list_item
*item
;
433 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
434 get_tree_entry(&o
->object
.oid
, path
,
435 &e
->stages
[1].oid
, &e
->stages
[1].mode
);
436 get_tree_entry(&a
->object
.oid
, path
,
437 &e
->stages
[2].oid
, &e
->stages
[2].mode
);
438 get_tree_entry(&b
->object
.oid
, path
,
439 &e
->stages
[3].oid
, &e
->stages
[3].mode
);
440 item
= string_list_insert(entries
, path
);
446 * Create a dictionary mapping file names to stage_data objects. The
447 * dictionary contains one entry for every path with a non-zero stage entry.
449 static struct string_list
*get_unmerged(void)
451 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
454 unmerged
->strdup_strings
= 1;
456 for (i
= 0; i
< active_nr
; i
++) {
457 struct string_list_item
*item
;
458 struct stage_data
*e
;
459 const struct cache_entry
*ce
= active_cache
[i
];
463 item
= string_list_lookup(unmerged
, ce
->name
);
465 item
= string_list_insert(unmerged
, ce
->name
);
466 item
->util
= xcalloc(1, sizeof(struct stage_data
));
469 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
470 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
476 static int string_list_df_name_compare(const char *one
, const char *two
)
478 int onelen
= strlen(one
);
479 int twolen
= strlen(two
);
481 * Here we only care that entries for D/F conflicts are
482 * adjacent, in particular with the file of the D/F conflict
483 * appearing before files below the corresponding directory.
484 * The order of the rest of the list is irrelevant for us.
486 * To achieve this, we sort with df_name_compare and provide
487 * the mode S_IFDIR so that D/F conflicts will sort correctly.
488 * We use the mode S_IFDIR for everything else for simplicity,
489 * since in other cases any changes in their order due to
490 * sorting cause no problems for us.
492 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
493 two
, twolen
, S_IFDIR
);
495 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
496 * that 'foo' comes before 'foo/bar'.
500 return onelen
- twolen
;
503 static void record_df_conflict_files(struct merge_options
*o
,
504 struct string_list
*entries
)
506 /* If there is a D/F conflict and the file for such a conflict
507 * currently exist in the working tree, we want to allow it to be
508 * removed to make room for the corresponding directory if needed.
509 * The files underneath the directories of such D/F conflicts will
510 * be processed before the corresponding file involved in the D/F
511 * conflict. If the D/F directory ends up being removed by the
512 * merge, then we won't have to touch the D/F file. If the D/F
513 * directory needs to be written to the working copy, then the D/F
514 * file will simply be removed (in make_room_for_path()) to make
515 * room for the necessary paths. Note that if both the directory
516 * and the file need to be present, then the D/F file will be
517 * reinstated with a new unique name at the time it is processed.
519 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
520 const char *last_file
= NULL
;
525 * If we're merging merge-bases, we don't want to bother with
526 * any working directory changes.
531 /* Ensure D/F conflicts are adjacent in the entries list. */
532 for (i
= 0; i
< entries
->nr
; i
++) {
533 struct string_list_item
*next
= &entries
->items
[i
];
534 string_list_append(&df_sorted_entries
, next
->string
)->util
=
537 df_sorted_entries
.cmp
= string_list_df_name_compare
;
538 string_list_sort(&df_sorted_entries
);
540 string_list_clear(&o
->df_conflict_file_set
, 1);
541 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
542 const char *path
= df_sorted_entries
.items
[i
].string
;
543 int len
= strlen(path
);
544 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
547 * Check if last_file & path correspond to a D/F conflict;
548 * i.e. whether path is last_file+'/'+<something>.
549 * If so, record that it's okay to remove last_file to make
550 * room for path and friends if needed.
554 memcmp(path
, last_file
, last_len
) == 0 &&
555 path
[last_len
] == '/') {
556 string_list_insert(&o
->df_conflict_file_set
, last_file
);
560 * Determine whether path could exist as a file in the
561 * working directory as a possible D/F conflict. This
562 * will only occur when it exists in stage 2 as a
565 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
572 string_list_clear(&df_sorted_entries
, 0);
576 struct diff_filepair
*pair
;
578 * Purpose of src_entry and dst_entry:
580 * If 'before' is renamed to 'after' then src_entry will contain
581 * the versions of 'before' from the merge_base, HEAD, and MERGE in
582 * stages 1, 2, and 3; dst_entry will contain the respective
583 * versions of 'after' in corresponding locations. Thus, we have a
584 * total of six modes and oids, though some will be null. (Stage 0
585 * is ignored; we're interested in handling conflicts.)
587 * Since we don't turn on break-rewrites by default, neither
588 * src_entry nor dst_entry can have all three of their stages have
589 * non-null oids, meaning at most four of the six will be non-null.
590 * Also, since this is a rename, both src_entry and dst_entry will
591 * have at least one non-null oid, meaning at least two will be
592 * non-null. Of the six oids, a typical rename will have three be
593 * non-null. Only two implies a rename/delete, and four implies a
596 struct stage_data
*src_entry
;
597 struct stage_data
*dst_entry
;
598 unsigned processed
:1;
601 static int update_stages(struct merge_options
*opt
, const char *path
,
602 const struct diff_filespec
*o
,
603 const struct diff_filespec
*a
,
604 const struct diff_filespec
*b
)
608 * NOTE: It is usually a bad idea to call update_stages on a path
609 * before calling update_file on that same path, since it can
610 * sometimes lead to spurious "refusing to lose untracked file..."
611 * messages from update_file (via make_room_for path via
612 * would_lose_untracked). Instead, reverse the order of the calls
613 * (executing update_file first and then update_stages).
616 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
618 if (remove_file_from_cache(path
))
621 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
624 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
627 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
632 static void update_entry(struct stage_data
*entry
,
633 struct diff_filespec
*o
,
634 struct diff_filespec
*a
,
635 struct diff_filespec
*b
)
637 entry
->processed
= 0;
638 entry
->stages
[1].mode
= o
->mode
;
639 entry
->stages
[2].mode
= a
->mode
;
640 entry
->stages
[3].mode
= b
->mode
;
641 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
642 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
643 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
646 static int remove_file(struct merge_options
*o
, int clean
,
647 const char *path
, int no_wd
)
649 int update_cache
= o
->call_depth
|| clean
;
650 int update_working_directory
= !o
->call_depth
&& !no_wd
;
653 if (remove_file_from_cache(path
))
656 if (update_working_directory
) {
658 struct cache_entry
*ce
;
659 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
660 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
663 if (remove_path(path
))
669 /* add a string to a strbuf, but converting "/" to "_" */
670 static void add_flattened_path(struct strbuf
*out
, const char *s
)
673 strbuf_addstr(out
, s
);
674 for (; i
< out
->len
; i
++)
675 if (out
->buf
[i
] == '/')
679 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
681 struct path_hashmap_entry
*entry
;
682 struct strbuf newpath
= STRBUF_INIT
;
686 strbuf_addf(&newpath
, "%s~", path
);
687 add_flattened_path(&newpath
, branch
);
689 base_len
= newpath
.len
;
690 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
691 path_hash(newpath
.buf
), newpath
.buf
) ||
692 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
693 strbuf_setlen(&newpath
, base_len
);
694 strbuf_addf(&newpath
, "_%d", suffix
++);
697 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
698 hashmap_entry_init(entry
, path_hash(entry
->path
));
699 hashmap_add(&o
->current_file_dir_set
, entry
);
700 return strbuf_detach(&newpath
, NULL
);
704 * Check whether a directory in the index is in the way of an incoming
705 * file. Return 1 if so. If check_working_copy is non-zero, also
706 * check the working directory. If empty_ok is non-zero, also return
707 * 0 in the case where the working-tree dir exists but is empty.
709 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
712 struct strbuf dirpath
= STRBUF_INIT
;
715 strbuf_addstr(&dirpath
, path
);
716 strbuf_addch(&dirpath
, '/');
718 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
722 if (pos
< active_nr
&&
723 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
724 strbuf_release(&dirpath
);
728 strbuf_release(&dirpath
);
729 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
730 !(empty_ok
&& is_empty_dir(path
));
733 static int was_tracked(const char *path
)
735 int pos
= cache_name_pos(path
, strlen(path
));
738 /* we have been tracking this path */
742 * Look for an unmerged entry for the path,
743 * specifically stage #2, which would indicate
744 * that "our" side before the merge started
745 * had the path tracked (and resulted in a conflict).
748 pos
< active_nr
&& !strcmp(path
, active_cache
[pos
]->name
);
750 if (ce_stage(active_cache
[pos
]) == 2)
755 static int would_lose_untracked(const char *path
)
757 return !was_tracked(path
) && file_exists(path
);
760 static int make_room_for_path(struct merge_options
*o
, const char *path
)
763 const char *msg
= _("failed to create path '%s'%s");
765 /* Unlink any D/F conflict files that are in the way */
766 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
767 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
768 size_t pathlen
= strlen(path
);
769 size_t df_pathlen
= strlen(df_path
);
770 if (df_pathlen
< pathlen
&&
771 path
[df_pathlen
] == '/' &&
772 strncmp(path
, df_path
, df_pathlen
) == 0) {
774 _("Removing %s to make room for subdirectory\n"),
777 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
783 /* Make sure leading directories are created */
784 status
= safe_create_leading_directories_const(path
);
786 if (status
== SCLD_EXISTS
)
787 /* something else exists */
788 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
789 return err(o
, msg
, path
, "");
793 * Do not unlink a file in the work tree if we are not
796 if (would_lose_untracked(path
))
797 return err(o
, _("refusing to lose untracked file at '%s'"),
800 /* Successful unlink is good.. */
803 /* .. and so is no existing file */
806 /* .. but not some other error (who really cares what?) */
807 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
810 static int update_file_flags(struct merge_options
*o
,
811 const struct object_id
*oid
,
823 enum object_type type
;
827 if (S_ISGITLINK(mode
)) {
829 * We may later decide to recursively descend into
830 * the submodule directory and update its index
831 * and/or work tree, but we do not do that now.
837 buf
= read_object_file(oid
, &type
, &size
);
839 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
840 if (type
!= OBJ_BLOB
) {
841 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
845 struct strbuf strbuf
= STRBUF_INIT
;
846 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
849 buf
= strbuf_detach(&strbuf
, NULL
);
853 if (make_room_for_path(o
, path
) < 0) {
857 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
863 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
865 ret
= err(o
, _("failed to open '%s': %s"),
866 path
, strerror(errno
));
869 write_in_full(fd
, buf
, size
);
871 } else if (S_ISLNK(mode
)) {
872 char *lnk
= xmemdupz(buf
, size
);
873 safe_create_leading_directories_const(path
);
875 if (symlink(lnk
, path
))
876 ret
= err(o
, _("failed to symlink '%s': %s"),
877 path
, strerror(errno
));
881 _("do not know what to do with %06o %s '%s'"),
882 mode
, oid_to_hex(oid
), path
);
887 if (!ret
&& update_cache
)
888 add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
892 static int update_file(struct merge_options
*o
,
894 const struct object_id
*oid
,
898 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
901 /* Low level file merging, update and removal */
903 struct merge_file_info
{
904 struct object_id oid
;
910 static int merge_3way(struct merge_options
*o
,
911 mmbuffer_t
*result_buf
,
912 const struct diff_filespec
*one
,
913 const struct diff_filespec
*a
,
914 const struct diff_filespec
*b
,
918 mmfile_t orig
, src1
, src2
;
919 struct ll_merge_options ll_opts
= {0};
920 char *base_name
, *name1
, *name2
;
923 ll_opts
.renormalize
= o
->renormalize
;
924 ll_opts
.xdl_opts
= o
->xdl_opts
;
927 ll_opts
.virtual_ancestor
= 1;
930 switch (o
->recursive_variant
) {
931 case MERGE_RECURSIVE_OURS
:
932 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
934 case MERGE_RECURSIVE_THEIRS
:
935 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
943 if (strcmp(a
->path
, b
->path
) ||
944 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
945 base_name
= o
->ancestor
== NULL
? NULL
:
946 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
947 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
948 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
950 base_name
= o
->ancestor
== NULL
? NULL
:
951 mkpathdup("%s", o
->ancestor
);
952 name1
= mkpathdup("%s", branch1
);
953 name2
= mkpathdup("%s", branch2
);
956 read_mmblob(&orig
, &one
->oid
);
957 read_mmblob(&src1
, &a
->oid
);
958 read_mmblob(&src2
, &b
->oid
);
960 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
961 &src1
, name1
, &src2
, name2
, &ll_opts
);
972 static int merge_file_1(struct merge_options
*o
,
973 const struct diff_filespec
*one
,
974 const struct diff_filespec
*a
,
975 const struct diff_filespec
*b
,
978 struct merge_file_info
*result
)
983 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
985 if (S_ISREG(a
->mode
)) {
986 result
->mode
= a
->mode
;
987 oidcpy(&result
->oid
, &a
->oid
);
989 result
->mode
= b
->mode
;
990 oidcpy(&result
->oid
, &b
->oid
);
993 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
999 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
1000 result
->mode
= b
->mode
;
1002 result
->mode
= a
->mode
;
1003 if (b
->mode
!= one
->mode
) {
1009 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
1010 oidcpy(&result
->oid
, &b
->oid
);
1011 else if (oid_eq(&b
->oid
, &one
->oid
))
1012 oidcpy(&result
->oid
, &a
->oid
);
1013 else if (S_ISREG(a
->mode
)) {
1014 mmbuffer_t result_buf
;
1015 int ret
= 0, merge_status
;
1017 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
1020 if ((merge_status
< 0) || !result_buf
.ptr
)
1021 ret
= err(o
, _("Failed to execute internal merge"));
1024 write_object_file(result_buf
.ptr
, result_buf
.size
,
1025 blob_type
, &result
->oid
))
1026 ret
= err(o
, _("Unable to add %s to database"),
1029 free(result_buf
.ptr
);
1032 result
->clean
= (merge_status
== 0);
1033 } else if (S_ISGITLINK(a
->mode
)) {
1034 result
->clean
= merge_submodule(&result
->oid
,
1040 } else if (S_ISLNK(a
->mode
)) {
1041 switch (o
->recursive_variant
) {
1042 case MERGE_RECURSIVE_NORMAL
:
1043 oidcpy(&result
->oid
, &a
->oid
);
1044 if (!oid_eq(&a
->oid
, &b
->oid
))
1047 case MERGE_RECURSIVE_OURS
:
1048 oidcpy(&result
->oid
, &a
->oid
);
1050 case MERGE_RECURSIVE_THEIRS
:
1051 oidcpy(&result
->oid
, &b
->oid
);
1055 die("BUG: unsupported object type in the tree");
1061 static int merge_file_special_markers(struct merge_options
*o
,
1062 const struct diff_filespec
*one
,
1063 const struct diff_filespec
*a
,
1064 const struct diff_filespec
*b
,
1065 const char *branch1
,
1066 const char *filename1
,
1067 const char *branch2
,
1068 const char *filename2
,
1069 struct merge_file_info
*mfi
)
1076 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1078 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1080 ret
= merge_file_1(o
, one
, a
, b
,
1081 side1
? side1
: branch1
,
1082 side2
? side2
: branch2
, mfi
);
1088 static int merge_file_one(struct merge_options
*o
,
1090 const struct object_id
*o_oid
, int o_mode
,
1091 const struct object_id
*a_oid
, int a_mode
,
1092 const struct object_id
*b_oid
, int b_mode
,
1093 const char *branch1
,
1094 const char *branch2
,
1095 struct merge_file_info
*mfi
)
1097 struct diff_filespec one
, a
, b
;
1099 one
.path
= a
.path
= b
.path
= (char *)path
;
1100 oidcpy(&one
.oid
, o_oid
);
1102 oidcpy(&a
.oid
, a_oid
);
1104 oidcpy(&b
.oid
, b_oid
);
1106 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
, mfi
);
1109 static int handle_change_delete(struct merge_options
*o
,
1110 const char *path
, const char *old_path
,
1111 const struct object_id
*o_oid
, int o_mode
,
1112 const struct object_id
*changed_oid
,
1114 const char *change_branch
,
1115 const char *delete_branch
,
1116 const char *change
, const char *change_past
)
1118 char *alt_path
= NULL
;
1119 const char *update_path
= path
;
1122 if (dir_in_way(path
, !o
->call_depth
, 0)) {
1123 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1126 if (o
->call_depth
) {
1128 * We cannot arbitrarily accept either a_sha or b_sha as
1129 * correct; since there is no true "middle point" between
1130 * them, simply reuse the base version for virtual merge base.
1132 ret
= remove_file_from_cache(path
);
1134 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1138 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1139 "and %s in %s. Version %s of %s left in tree."),
1140 change
, path
, delete_branch
, change_past
,
1141 change_branch
, change_branch
, path
);
1143 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1144 "and %s to %s in %s. Version %s of %s left in tree."),
1145 change
, old_path
, delete_branch
, change_past
, path
,
1146 change_branch
, change_branch
, path
);
1150 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1151 "and %s in %s. Version %s of %s left in tree at %s."),
1152 change
, path
, delete_branch
, change_past
,
1153 change_branch
, change_branch
, path
, alt_path
);
1155 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1156 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1157 change
, old_path
, delete_branch
, change_past
, path
,
1158 change_branch
, change_branch
, path
, alt_path
);
1162 * No need to call update_file() on path when change_branch ==
1163 * o->branch1 && !alt_path, since that would needlessly touch
1164 * path. We could call update_file_flags() with update_cache=0
1165 * and update_wd=0, but that's a no-op.
1167 if (change_branch
!= o
->branch1
|| alt_path
)
1168 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1175 static int conflict_rename_delete(struct merge_options
*o
,
1176 struct diff_filepair
*pair
,
1177 const char *rename_branch
,
1178 const char *delete_branch
)
1180 const struct diff_filespec
*orig
= pair
->one
;
1181 const struct diff_filespec
*dest
= pair
->two
;
1183 if (handle_change_delete(o
,
1184 o
->call_depth
? orig
->path
: dest
->path
,
1185 o
->call_depth
? NULL
: orig
->path
,
1186 &orig
->oid
, orig
->mode
,
1187 &dest
->oid
, dest
->mode
,
1188 rename_branch
, delete_branch
,
1189 _("rename"), _("renamed")))
1193 return remove_file_from_cache(dest
->path
);
1195 return update_stages(o
, dest
->path
, NULL
,
1196 rename_branch
== o
->branch1
? dest
: NULL
,
1197 rename_branch
== o
->branch1
? NULL
: dest
);
1200 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1201 struct stage_data
*entry
,
1204 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1205 unsigned mode
= entry
->stages
[stage
].mode
;
1206 if (mode
== 0 || is_null_oid(oid
))
1208 oidcpy(&target
->oid
, oid
);
1209 target
->mode
= mode
;
1213 static int handle_file(struct merge_options
*o
,
1214 struct diff_filespec
*rename
,
1216 struct rename_conflict_info
*ci
)
1218 char *dst_name
= rename
->path
;
1219 struct stage_data
*dst_entry
;
1220 const char *cur_branch
, *other_branch
;
1221 struct diff_filespec other
;
1222 struct diff_filespec
*add
;
1226 dst_entry
= ci
->dst_entry1
;
1227 cur_branch
= ci
->branch1
;
1228 other_branch
= ci
->branch2
;
1230 dst_entry
= ci
->dst_entry2
;
1231 cur_branch
= ci
->branch2
;
1232 other_branch
= ci
->branch1
;
1235 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1237 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1238 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1241 remove_file(o
, 0, rename
->path
, 0);
1242 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1244 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1245 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1246 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1247 rename
->path
, other_branch
, dst_name
);
1250 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1251 ; /* fall through, do allow dst_name to be released */
1252 else if (stage
== 2)
1253 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1255 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1257 if (dst_name
!= rename
->path
)
1263 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1264 struct rename_conflict_info
*ci
)
1266 /* One file was renamed in both branches, but to different names. */
1267 struct diff_filespec
*one
= ci
->pair1
->one
;
1268 struct diff_filespec
*a
= ci
->pair1
->two
;
1269 struct diff_filespec
*b
= ci
->pair2
->two
;
1271 output(o
, 1, _("CONFLICT (rename/rename): "
1272 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1273 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1274 one
->path
, a
->path
, ci
->branch1
,
1275 one
->path
, b
->path
, ci
->branch2
,
1276 o
->call_depth
? _(" (left unresolved)") : "");
1277 if (o
->call_depth
) {
1278 struct merge_file_info mfi
;
1279 struct diff_filespec other
;
1280 struct diff_filespec
*add
;
1281 if (merge_file_one(o
, one
->path
,
1282 &one
->oid
, one
->mode
,
1285 ci
->branch1
, ci
->branch2
, &mfi
))
1289 * FIXME: For rename/add-source conflicts (if we could detect
1290 * such), this is wrong. We should instead find a unique
1291 * pathname and then either rename the add-source file to that
1292 * unique path, or use that unique path instead of src here.
1294 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1298 * Above, we put the merged content at the merge-base's
1299 * path. Now we usually need to delete both a->path and
1300 * b->path. However, the rename on each side of the merge
1301 * could also be involved in a rename/add conflict. In
1302 * such cases, we should keep the added file around,
1303 * resolving the conflict at that path in its favor.
1305 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1307 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1311 remove_file_from_cache(a
->path
);
1312 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1314 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1318 remove_file_from_cache(b
->path
);
1319 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1325 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1326 struct rename_conflict_info
*ci
)
1328 /* Two files, a & b, were renamed to the same thing, c. */
1329 struct diff_filespec
*a
= ci
->pair1
->one
;
1330 struct diff_filespec
*b
= ci
->pair2
->one
;
1331 struct diff_filespec
*c1
= ci
->pair1
->two
;
1332 struct diff_filespec
*c2
= ci
->pair2
->two
;
1333 char *path
= c1
->path
; /* == c2->path */
1334 struct merge_file_info mfi_c1
;
1335 struct merge_file_info mfi_c2
;
1338 output(o
, 1, _("CONFLICT (rename/rename): "
1339 "Rename %s->%s in %s. "
1340 "Rename %s->%s in %s"),
1341 a
->path
, c1
->path
, ci
->branch1
,
1342 b
->path
, c2
->path
, ci
->branch2
);
1344 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1345 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1347 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1348 o
->branch1
, c1
->path
,
1349 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1350 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1351 o
->branch1
, ci
->ren2_other
.path
,
1352 o
->branch2
, c2
->path
, &mfi_c2
))
1355 if (o
->call_depth
) {
1357 * If mfi_c1.clean && mfi_c2.clean, then it might make
1358 * sense to do a two-way merge of those results. But, I
1359 * think in all cases, it makes sense to have the virtual
1360 * merge base just undo the renames; they can be detected
1361 * again later for the non-recursive merge.
1363 remove_file(o
, 0, path
, 0);
1364 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1366 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1369 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1370 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1371 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1372 a
->path
, new_path1
, b
->path
, new_path2
);
1373 remove_file(o
, 0, path
, 0);
1374 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1376 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1386 * Get the diff_filepairs changed between o_tree and tree.
1388 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*o
,
1389 struct tree
*o_tree
,
1392 struct diff_queue_struct
*ret
;
1393 struct diff_options opts
;
1396 opts
.flags
.recursive
= 1;
1397 opts
.flags
.rename_empty
= 0;
1398 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1399 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
1400 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
1402 opts
.rename_score
= o
->rename_score
;
1403 opts
.show_rename_progress
= o
->show_rename_progress
;
1404 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1405 diff_setup_done(&opts
);
1406 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1407 diffcore_std(&opts
);
1408 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
1409 o
->needed_rename_limit
= opts
.needed_rename_limit
;
1411 ret
= xmalloc(sizeof(*ret
));
1412 *ret
= diff_queued_diff
;
1414 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1415 diff_queued_diff
.nr
= 0;
1416 diff_queued_diff
.queue
= NULL
;
1421 static int tree_has_path(struct tree
*tree
, const char *path
)
1423 struct object_id hashy
;
1424 unsigned int mode_o
;
1426 return !get_tree_entry(&tree
->object
.oid
, path
,
1431 * Return a new string that replaces the beginning portion (which matches
1432 * entry->dir), with entry->new_dir. In perl-speak:
1433 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1435 * Caller must ensure that old_path starts with entry->dir + '/'.
1437 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1438 const char *old_path
)
1440 struct strbuf new_path
= STRBUF_INIT
;
1443 if (entry
->non_unique_new_dir
)
1446 oldlen
= strlen(entry
->dir
);
1447 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1448 strbuf_grow(&new_path
, newlen
);
1449 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1450 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1452 return strbuf_detach(&new_path
, NULL
);
1455 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1456 char **old_dir
, char **new_dir
)
1458 char *end_of_old
, *end_of_new
;
1459 int old_len
, new_len
;
1466 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1467 * the "e/foo.c" part is the same, we just want to know that
1468 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1469 * so, for this example, this function returns "a/b/c/d" in
1470 * *old_dir and "a/b/some/thing/else" in *new_dir.
1472 * Also, if the basename of the file changed, we don't care. We
1473 * want to know which portion of the directory, if any, changed.
1475 end_of_old
= strrchr(old_path
, '/');
1476 end_of_new
= strrchr(new_path
, '/');
1478 if (end_of_old
== NULL
|| end_of_new
== NULL
)
1480 while (*--end_of_new
== *--end_of_old
&&
1481 end_of_old
!= old_path
&&
1482 end_of_new
!= new_path
)
1483 ; /* Do nothing; all in the while loop */
1485 * We've found the first non-matching character in the directory
1486 * paths. That means the current directory we were comparing
1487 * represents the rename. Move end_of_old and end_of_new back
1488 * to the full directory name.
1490 if (*end_of_old
== '/')
1492 if (*end_of_old
!= '/')
1494 end_of_old
= strchr(end_of_old
, '/');
1495 end_of_new
= strchr(end_of_new
, '/');
1498 * It may have been the case that old_path and new_path were the same
1499 * directory all along. Don't claim a rename if they're the same.
1501 old_len
= end_of_old
- old_path
;
1502 new_len
= end_of_new
- new_path
;
1504 if (old_len
!= new_len
|| strncmp(old_path
, new_path
, old_len
)) {
1505 *old_dir
= xstrndup(old_path
, old_len
);
1506 *new_dir
= xstrndup(new_path
, new_len
);
1510 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
1511 struct string_list
*items_to_remove
)
1514 struct dir_rename_entry
*entry
;
1516 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
1517 entry
= items_to_remove
->items
[i
].util
;
1518 hashmap_remove(dir_renames
, entry
, NULL
);
1520 string_list_clear(items_to_remove
, 0);
1524 * There are a couple things we want to do at the directory level:
1525 * 1. Check for both sides renaming to the same thing, in order to avoid
1526 * implicit renaming of files that should be left in place. (See
1527 * testcase 6b in t6043 for details.)
1528 * 2. Prune directory renames if there are still files left in the
1529 * the original directory. These represent a partial directory rename,
1530 * i.e. a rename where only some of the files within the directory
1531 * were renamed elsewhere. (Technically, this could be done earlier
1532 * in get_directory_renames(), except that would prevent us from
1533 * doing the previous check and thus failing testcase 6b.)
1534 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
1535 * In the future, we could potentially record this info as well and
1536 * omit reporting rename/rename(1to2) conflicts for each path within
1537 * the affected directories, thus cleaning up the merge output.
1538 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
1539 * directory level, because merging directories is fine. If it
1540 * causes conflicts for files within those merged directories, then
1541 * that should be detected at the individual path level.
1543 static void handle_directory_level_conflicts(struct merge_options
*o
,
1544 struct hashmap
*dir_re_head
,
1546 struct hashmap
*dir_re_merge
,
1549 struct hashmap_iter iter
;
1550 struct dir_rename_entry
*head_ent
;
1551 struct dir_rename_entry
*merge_ent
;
1553 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
1554 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
1556 hashmap_iter_init(dir_re_head
, &iter
);
1557 while ((head_ent
= hashmap_iter_next(&iter
))) {
1558 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
1560 !head_ent
->non_unique_new_dir
&&
1561 !merge_ent
->non_unique_new_dir
&&
1562 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
1563 /* 1. Renamed identically; remove it from both sides */
1564 string_list_append(&remove_from_head
,
1565 head_ent
->dir
)->util
= head_ent
;
1566 strbuf_release(&head_ent
->new_dir
);
1567 string_list_append(&remove_from_merge
,
1568 merge_ent
->dir
)->util
= merge_ent
;
1569 strbuf_release(&merge_ent
->new_dir
);
1570 } else if (tree_has_path(head
, head_ent
->dir
)) {
1571 /* 2. This wasn't a directory rename after all */
1572 string_list_append(&remove_from_head
,
1573 head_ent
->dir
)->util
= head_ent
;
1574 strbuf_release(&head_ent
->new_dir
);
1578 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
1579 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
1581 hashmap_iter_init(dir_re_merge
, &iter
);
1582 while ((merge_ent
= hashmap_iter_next(&iter
))) {
1583 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
1584 if (tree_has_path(merge
, merge_ent
->dir
)) {
1585 /* 2. This wasn't a directory rename after all */
1586 string_list_append(&remove_from_merge
,
1587 merge_ent
->dir
)->util
= merge_ent
;
1588 } else if (head_ent
&&
1589 !head_ent
->non_unique_new_dir
&&
1590 !merge_ent
->non_unique_new_dir
) {
1591 /* 3. rename/rename(1to2) */
1593 * We can assume it's not rename/rename(1to1) because
1594 * that was case (1), already checked above. So we
1595 * know that head_ent->new_dir and merge_ent->new_dir
1596 * are different strings.
1598 output(o
, 1, _("CONFLICT (rename/rename): "
1599 "Rename directory %s->%s in %s. "
1600 "Rename directory %s->%s in %s"),
1601 head_ent
->dir
, head_ent
->new_dir
.buf
, o
->branch1
,
1602 head_ent
->dir
, merge_ent
->new_dir
.buf
, o
->branch2
);
1603 string_list_append(&remove_from_head
,
1604 head_ent
->dir
)->util
= head_ent
;
1605 strbuf_release(&head_ent
->new_dir
);
1606 string_list_append(&remove_from_merge
,
1607 merge_ent
->dir
)->util
= merge_ent
;
1608 strbuf_release(&merge_ent
->new_dir
);
1612 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
1613 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
1616 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
,
1619 struct hashmap
*dir_renames
;
1620 struct hashmap_iter iter
;
1621 struct dir_rename_entry
*entry
;
1625 * Typically, we think of a directory rename as all files from a
1626 * certain directory being moved to a target directory. However,
1627 * what if someone first moved two files from the original
1628 * directory in one commit, and then renamed the directory
1629 * somewhere else in a later commit? At merge time, we just know
1630 * that files from the original directory went to two different
1631 * places, and that the bulk of them ended up in the same place.
1632 * We want each directory rename to represent where the bulk of the
1633 * files from that directory end up; this function exists to find
1634 * where the bulk of the files went.
1636 * The first loop below simply iterates through the list of file
1637 * renames, finding out how often each directory rename pair
1638 * possibility occurs.
1640 dir_renames
= xmalloc(sizeof(*dir_renames
));
1641 dir_rename_init(dir_renames
);
1642 for (i
= 0; i
< pairs
->nr
; ++i
) {
1643 struct string_list_item
*item
;
1645 struct diff_filepair
*pair
= pairs
->queue
[i
];
1646 char *old_dir
, *new_dir
;
1648 /* File not part of directory rename if it wasn't renamed */
1649 if (pair
->status
!= 'R')
1652 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
1653 &old_dir
, &new_dir
);
1655 /* Directory didn't change at all; ignore this one. */
1658 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
1660 entry
= xmalloc(sizeof(*entry
));
1661 dir_rename_entry_init(entry
, old_dir
);
1662 hashmap_put(dir_renames
, entry
);
1666 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
1668 item
= string_list_insert(&entry
->possible_new_dirs
,
1670 item
->util
= xcalloc(1, sizeof(int));
1679 * For each directory with files moved out of it, we find out which
1680 * target directory received the most files so we can declare it to
1681 * be the "winning" target location for the directory rename. This
1682 * winner gets recorded in new_dir. If there is no winner
1683 * (multiple target directories received the same number of files),
1684 * we set non_unique_new_dir. Once we've determined the winner (or
1685 * that there is no winner), we no longer need possible_new_dirs.
1687 hashmap_iter_init(dir_renames
, &iter
);
1688 while ((entry
= hashmap_iter_next(&iter
))) {
1693 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
1694 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
1698 else if (*count
> max
) {
1700 best
= entry
->possible_new_dirs
.items
[i
].string
;
1704 entry
->non_unique_new_dir
= 1;
1706 assert(entry
->new_dir
.len
== 0);
1707 strbuf_addstr(&entry
->new_dir
, best
);
1710 * The relevant directory sub-portion of the original full
1711 * filepaths were xstrndup'ed before inserting into
1712 * possible_new_dirs, and instead of manually iterating the
1713 * list and free'ing each, just lie and tell
1714 * possible_new_dirs that it did the strdup'ing so that it
1715 * will free them for us.
1717 entry
->possible_new_dirs
.strdup_strings
= 1;
1718 string_list_clear(&entry
->possible_new_dirs
, 1);
1724 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
1725 struct hashmap
*dir_renames
)
1727 char temp
[PATH_MAX
];
1729 struct dir_rename_entry
*entry
;
1732 while ((end
= strrchr(temp
, '/'))) {
1734 entry
= dir_rename_find_entry(dir_renames
, temp
);
1741 static void compute_collisions(struct hashmap
*collisions
,
1742 struct hashmap
*dir_renames
,
1743 struct diff_queue_struct
*pairs
)
1748 * Multiple files can be mapped to the same path due to directory
1749 * renames done by the other side of history. Since that other
1750 * side of history could have merged multiple directories into one,
1751 * if our side of history added the same file basename to each of
1752 * those directories, then all N of them would get implicitly
1753 * renamed by the directory rename detection into the same path,
1754 * and we'd get an add/add/.../add conflict, and all those adds
1755 * from *this* side of history. This is not representable in the
1756 * index, and users aren't going to easily be able to make sense of
1757 * it. So we need to provide a good warning about what's
1758 * happening, and fall back to no-directory-rename detection
1759 * behavior for those paths.
1761 * See testcases 9e and all of section 5 from t6043 for examples.
1763 collision_init(collisions
);
1765 for (i
= 0; i
< pairs
->nr
; ++i
) {
1766 struct dir_rename_entry
*dir_rename_ent
;
1767 struct collision_entry
*collision_ent
;
1769 struct diff_filepair
*pair
= pairs
->queue
[i
];
1771 if (pair
->status
== 'D')
1773 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
1775 if (!dir_rename_ent
)
1778 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
1781 * dir_rename_ent->non_unique_new_path is true, which
1782 * means there is no directory rename for us to use,
1783 * which means it won't cause us any additional
1787 collision_ent
= collision_find_entry(collisions
, new_path
);
1788 if (!collision_ent
) {
1789 collision_ent
= xcalloc(1,
1790 sizeof(struct collision_entry
));
1791 hashmap_entry_init(collision_ent
, strhash(new_path
));
1792 hashmap_put(collisions
, collision_ent
);
1793 collision_ent
->target_file
= new_path
;
1797 string_list_insert(&collision_ent
->source_files
,
1803 * Get information of all renames which occurred in 'pairs', making use of
1804 * any implicit directory renames inferred from the other side of history.
1805 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
1806 * to be able to associate the correct cache entries with the rename
1807 * information; tree is always equal to either a_tree or b_tree.
1809 static struct string_list
*get_renames(struct merge_options
*o
,
1810 struct diff_queue_struct
*pairs
,
1811 struct hashmap
*dir_renames
,
1813 struct tree
*o_tree
,
1814 struct tree
*a_tree
,
1815 struct tree
*b_tree
,
1816 struct string_list
*entries
)
1819 struct hashmap collisions
;
1820 struct hashmap_iter iter
;
1821 struct collision_entry
*e
;
1822 struct string_list
*renames
;
1824 compute_collisions(&collisions
, dir_renames
, pairs
);
1825 renames
= xcalloc(1, sizeof(struct string_list
));
1827 for (i
= 0; i
< pairs
->nr
; ++i
) {
1828 struct string_list_item
*item
;
1830 struct diff_filepair
*pair
= pairs
->queue
[i
];
1832 if (pair
->status
!= 'R') {
1833 diff_free_filepair(pair
);
1836 re
= xmalloc(sizeof(*re
));
1839 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
1841 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
1842 o_tree
, a_tree
, b_tree
, entries
);
1844 re
->src_entry
= item
->util
;
1846 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
1848 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
1849 o_tree
, a_tree
, b_tree
, entries
);
1851 re
->dst_entry
= item
->util
;
1852 item
= string_list_insert(renames
, pair
->one
->path
);
1856 hashmap_iter_init(&collisions
, &iter
);
1857 while ((e
= hashmap_iter_next(&iter
))) {
1858 free(e
->target_file
);
1859 string_list_clear(&e
->source_files
, 0);
1861 hashmap_free(&collisions
, 1);
1865 static int process_renames(struct merge_options
*o
,
1866 struct string_list
*a_renames
,
1867 struct string_list
*b_renames
)
1869 int clean_merge
= 1, i
, j
;
1870 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1871 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1872 const struct rename
*sre
;
1874 for (i
= 0; i
< a_renames
->nr
; i
++) {
1875 sre
= a_renames
->items
[i
].util
;
1876 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1879 for (i
= 0; i
< b_renames
->nr
; i
++) {
1880 sre
= b_renames
->items
[i
].util
;
1881 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1885 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1886 struct string_list
*renames1
, *renames2Dst
;
1887 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1888 const char *branch1
, *branch2
;
1889 const char *ren1_src
, *ren1_dst
;
1890 struct string_list_item
*lookup
;
1892 if (i
>= a_renames
->nr
) {
1893 ren2
= b_renames
->items
[j
++].util
;
1894 } else if (j
>= b_renames
->nr
) {
1895 ren1
= a_renames
->items
[i
++].util
;
1897 int compare
= strcmp(a_renames
->items
[i
].string
,
1898 b_renames
->items
[j
].string
);
1900 ren1
= a_renames
->items
[i
++].util
;
1902 ren2
= b_renames
->items
[j
++].util
;
1905 /* TODO: refactor, so that 1/2 are not needed */
1907 renames1
= a_renames
;
1908 renames2Dst
= &b_by_dst
;
1909 branch1
= o
->branch1
;
1910 branch2
= o
->branch2
;
1912 renames1
= b_renames
;
1913 renames2Dst
= &a_by_dst
;
1914 branch1
= o
->branch2
;
1915 branch2
= o
->branch1
;
1919 if (ren1
->processed
)
1921 ren1
->processed
= 1;
1922 ren1
->dst_entry
->processed
= 1;
1923 /* BUG: We should only mark src_entry as processed if we
1924 * are not dealing with a rename + add-source case.
1926 ren1
->src_entry
->processed
= 1;
1928 ren1_src
= ren1
->pair
->one
->path
;
1929 ren1_dst
= ren1
->pair
->two
->path
;
1932 /* One file renamed on both sides */
1933 const char *ren2_src
= ren2
->pair
->one
->path
;
1934 const char *ren2_dst
= ren2
->pair
->two
->path
;
1935 enum rename_type rename_type
;
1936 if (strcmp(ren1_src
, ren2_src
) != 0)
1937 die("BUG: ren1_src != ren2_src");
1938 ren2
->dst_entry
->processed
= 1;
1939 ren2
->processed
= 1;
1940 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1941 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1944 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1945 /* BUG: We should only remove ren1_src in
1946 * the base stage (think of rename +
1947 * add-source cases).
1949 remove_file(o
, 1, ren1_src
, 1);
1950 update_entry(ren1
->dst_entry
,
1955 setup_rename_conflict_info(rename_type
,
1965 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1966 /* Two different files renamed to the same thing */
1968 ren2
= lookup
->util
;
1969 ren2_dst
= ren2
->pair
->two
->path
;
1970 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1971 die("BUG: ren1_dst != ren2_dst");
1974 ren2
->processed
= 1;
1976 * BUG: We should only mark src_entry as processed
1977 * if we are not dealing with a rename + add-source
1980 ren2
->src_entry
->processed
= 1;
1982 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1994 /* Renamed in 1, maybe changed in 2 */
1995 /* we only use sha1 and mode of these */
1996 struct diff_filespec src_other
, dst_other
;
2000 * unpack_trees loads entries from common-commit
2001 * into stage 1, from head-commit into stage 2, and
2002 * from merge-commit into stage 3. We keep track
2003 * of which side corresponds to the rename.
2005 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2006 int other_stage
= a_renames
== renames1
? 3 : 2;
2008 /* BUG: We should only remove ren1_src in the base
2009 * stage and in other_stage (think of rename +
2012 remove_file(o
, 1, ren1_src
,
2013 renamed_stage
== 2 || !was_tracked(ren1_src
));
2015 oidcpy(&src_other
.oid
,
2016 &ren1
->src_entry
->stages
[other_stage
].oid
);
2017 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2018 oidcpy(&dst_other
.oid
,
2019 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2020 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2023 if (oid_eq(&src_other
.oid
, &null_oid
)) {
2024 setup_rename_conflict_info(RENAME_DELETE
,
2034 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2035 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2037 * Added file on the other side identical to
2038 * the file being renamed: clean merge.
2039 * Also, there is no need to overwrite the
2040 * file already in the working copy, so call
2041 * update_file_flags() instead of
2044 if (update_file_flags(o
,
2045 &ren1
->pair
->two
->oid
,
2046 ren1
->pair
->two
->mode
,
2048 1, /* update_cache */
2051 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
2054 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2056 ren1_src
, ren1_dst
, branch1
,
2058 if (o
->call_depth
) {
2059 struct merge_file_info mfi
;
2060 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
2061 &ren1
->pair
->two
->oid
,
2062 ren1
->pair
->two
->mode
,
2065 branch1
, branch2
, &mfi
)) {
2067 goto cleanup_and_return
;
2069 output(o
, 1, _("Adding merged %s"), ren1_dst
);
2070 if (update_file(o
, 0, &mfi
.oid
,
2071 mfi
.mode
, ren1_dst
))
2075 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
2076 output(o
, 1, _("Adding as %s instead"), new_path
);
2077 if (update_file(o
, 0, &dst_other
.oid
,
2078 dst_other
.mode
, new_path
))
2085 if (clean_merge
< 0)
2086 goto cleanup_and_return
;
2088 struct diff_filespec
*one
, *a
, *b
;
2089 src_other
.path
= (char *)ren1_src
;
2091 one
= ren1
->pair
->one
;
2092 if (a_renames
== renames1
) {
2093 a
= ren1
->pair
->two
;
2096 b
= ren1
->pair
->two
;
2099 update_entry(ren1
->dst_entry
, one
, a
, b
);
2100 setup_rename_conflict_info(RENAME_NORMAL
,
2114 string_list_clear(&a_by_dst
, 0);
2115 string_list_clear(&b_by_dst
, 0);
2120 struct rename_info
{
2121 struct string_list
*head_renames
;
2122 struct string_list
*merge_renames
;
2125 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2126 struct hashmap
*dir_renames
)
2128 struct hashmap_iter iter
;
2129 struct dir_rename_entry
*e
;
2131 hashmap_iter_init(dir_renames
, &iter
);
2132 while ((e
= hashmap_iter_next(&iter
))) {
2134 strbuf_release(&e
->new_dir
);
2135 /* possible_new_dirs already cleared in get_directory_renames */
2137 hashmap_free(dir_renames
, 1);
2144 static int handle_renames(struct merge_options
*o
,
2145 struct tree
*common
,
2148 struct string_list
*entries
,
2149 struct rename_info
*ri
)
2151 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2152 struct hashmap
*dir_re_head
, *dir_re_merge
;
2155 ri
->head_renames
= NULL
;
2156 ri
->merge_renames
= NULL
;
2158 if (!o
->detect_rename
)
2161 head_pairs
= get_diffpairs(o
, common
, head
);
2162 merge_pairs
= get_diffpairs(o
, common
, merge
);
2164 dir_re_head
= get_directory_renames(head_pairs
, head
);
2165 dir_re_merge
= get_directory_renames(merge_pairs
, merge
);
2167 handle_directory_level_conflicts(o
,
2169 dir_re_merge
, merge
);
2171 ri
->head_renames
= get_renames(o
, head_pairs
,
2173 common
, head
, merge
, entries
);
2174 ri
->merge_renames
= get_renames(o
, merge_pairs
,
2176 common
, head
, merge
, entries
);
2177 clean
= process_renames(o
, ri
->head_renames
, ri
->merge_renames
);
2180 * Some cleanup is deferred until cleanup_renames() because the
2181 * data structures are still needed and referenced in
2182 * process_entry(). But there are a few things we can free now.
2184 initial_cleanup_rename(head_pairs
, dir_re_head
);
2185 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2190 static void final_cleanup_rename(struct string_list
*rename
)
2192 const struct rename
*re
;
2198 for (i
= 0; i
< rename
->nr
; i
++) {
2199 re
= rename
->items
[i
].util
;
2200 diff_free_filepair(re
->pair
);
2202 string_list_clear(rename
, 1);
2206 static void final_cleanup_renames(struct rename_info
*re_info
)
2208 final_cleanup_rename(re_info
->head_renames
);
2209 final_cleanup_rename(re_info
->merge_renames
);
2212 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
2214 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
2217 static int read_oid_strbuf(struct merge_options
*o
,
2218 const struct object_id
*oid
, struct strbuf
*dst
)
2221 enum object_type type
;
2223 buf
= read_object_file(oid
, &type
, &size
);
2225 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
2226 if (type
!= OBJ_BLOB
) {
2228 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
2230 strbuf_attach(dst
, buf
, size
, size
+ 1);
2234 static int blob_unchanged(struct merge_options
*opt
,
2235 const struct object_id
*o_oid
,
2237 const struct object_id
*a_oid
,
2239 int renormalize
, const char *path
)
2241 struct strbuf o
= STRBUF_INIT
;
2242 struct strbuf a
= STRBUF_INIT
;
2243 int ret
= 0; /* assume changed for safety */
2245 if (a_mode
!= o_mode
)
2247 if (oid_eq(o_oid
, a_oid
))
2252 assert(o_oid
&& a_oid
);
2253 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
2256 * Note: binary | is used so that both renormalizations are
2257 * performed. Comparison can be skipped if both files are
2258 * unchanged since their sha1s have already been compared.
2260 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
2261 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
2262 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
2270 static int handle_modify_delete(struct merge_options
*o
,
2272 struct object_id
*o_oid
, int o_mode
,
2273 struct object_id
*a_oid
, int a_mode
,
2274 struct object_id
*b_oid
, int b_mode
)
2276 const char *modify_branch
, *delete_branch
;
2277 struct object_id
*changed_oid
;
2281 modify_branch
= o
->branch1
;
2282 delete_branch
= o
->branch2
;
2283 changed_oid
= a_oid
;
2284 changed_mode
= a_mode
;
2286 modify_branch
= o
->branch2
;
2287 delete_branch
= o
->branch1
;
2288 changed_oid
= b_oid
;
2289 changed_mode
= b_mode
;
2292 return handle_change_delete(o
,
2295 changed_oid
, changed_mode
,
2296 modify_branch
, delete_branch
,
2297 _("modify"), _("modified"));
2300 static int merge_content(struct merge_options
*o
,
2302 struct object_id
*o_oid
, int o_mode
,
2303 struct object_id
*a_oid
, int a_mode
,
2304 struct object_id
*b_oid
, int b_mode
,
2305 struct rename_conflict_info
*rename_conflict_info
)
2307 const char *reason
= _("content");
2308 const char *path1
= NULL
, *path2
= NULL
;
2309 struct merge_file_info mfi
;
2310 struct diff_filespec one
, a
, b
;
2311 unsigned df_conflict_remains
= 0;
2314 reason
= _("add/add");
2315 o_oid
= (struct object_id
*)&null_oid
;
2317 one
.path
= a
.path
= b
.path
= (char *)path
;
2318 oidcpy(&one
.oid
, o_oid
);
2320 oidcpy(&a
.oid
, a_oid
);
2322 oidcpy(&b
.oid
, b_oid
);
2325 if (rename_conflict_info
) {
2326 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
2328 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
2329 pair1
->two
->path
: pair1
->one
->path
;
2330 /* If rename_conflict_info->pair2 != NULL, we are in
2331 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
2334 path2
= (rename_conflict_info
->pair2
||
2335 o
->branch2
== rename_conflict_info
->branch1
) ?
2336 pair1
->two
->path
: pair1
->one
->path
;
2338 if (dir_in_way(path
, !o
->call_depth
,
2339 S_ISGITLINK(pair1
->two
->mode
)))
2340 df_conflict_remains
= 1;
2342 if (merge_file_special_markers(o
, &one
, &a
, &b
,
2344 o
->branch2
, path2
, &mfi
))
2347 if (mfi
.clean
&& !df_conflict_remains
&&
2348 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
2349 int path_renamed_outside_HEAD
;
2350 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
2352 * The content merge resulted in the same file contents we
2353 * already had. We can return early if those file contents
2354 * are recorded at the correct path (which may not be true
2355 * if the merge involves a rename).
2357 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
2358 if (!path_renamed_outside_HEAD
) {
2359 add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
2360 0, (!o
->call_depth
), 0);
2364 output(o
, 2, _("Auto-merging %s"), path
);
2367 if (S_ISGITLINK(mfi
.mode
))
2368 reason
= _("submodule");
2369 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
2371 if (rename_conflict_info
&& !df_conflict_remains
)
2372 if (update_stages(o
, path
, &one
, &a
, &b
))
2376 if (df_conflict_remains
) {
2378 if (o
->call_depth
) {
2379 remove_file_from_cache(path
);
2382 if (update_stages(o
, path
, &one
, &a
, &b
))
2385 int file_from_stage2
= was_tracked(path
);
2386 struct diff_filespec merged
;
2387 oidcpy(&merged
.oid
, &mfi
.oid
);
2388 merged
.mode
= mfi
.mode
;
2390 if (update_stages(o
, path
, NULL
,
2391 file_from_stage2
? &merged
: NULL
,
2392 file_from_stage2
? NULL
: &merged
))
2397 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
2398 output(o
, 1, _("Adding as %s instead"), new_path
);
2399 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
2405 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
2410 /* Per entry merge function */
2411 static int process_entry(struct merge_options
*o
,
2412 const char *path
, struct stage_data
*entry
)
2414 int clean_merge
= 1;
2415 int normalize
= o
->renormalize
;
2416 unsigned o_mode
= entry
->stages
[1].mode
;
2417 unsigned a_mode
= entry
->stages
[2].mode
;
2418 unsigned b_mode
= entry
->stages
[3].mode
;
2419 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
2420 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
2421 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
2423 entry
->processed
= 1;
2424 if (entry
->rename_conflict_info
) {
2425 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
2426 switch (conflict_info
->rename_type
) {
2428 case RENAME_ONE_FILE_TO_ONE
:
2429 clean_merge
= merge_content(o
, path
,
2430 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
2435 if (conflict_rename_delete(o
,
2436 conflict_info
->pair1
,
2437 conflict_info
->branch1
,
2438 conflict_info
->branch2
))
2441 case RENAME_ONE_FILE_TO_TWO
:
2443 if (conflict_rename_rename_1to2(o
, conflict_info
))
2446 case RENAME_TWO_FILES_TO_ONE
:
2448 if (conflict_rename_rename_2to1(o
, conflict_info
))
2452 entry
->processed
= 0;
2455 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
2456 /* Case A: Deleted in one */
2457 if ((!a_oid
&& !b_oid
) ||
2458 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
2459 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
2460 /* Deleted in both or deleted in one and
2461 * unchanged in the other */
2463 output(o
, 2, _("Removing %s"), path
);
2464 /* do not touch working file if it did not exist */
2465 remove_file(o
, 1, path
, !a_oid
);
2467 /* Modify/delete; deleted side may have put a directory in the way */
2469 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
2470 a_oid
, a_mode
, b_oid
, b_mode
))
2473 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
2474 (!o_oid
&& !a_oid
&& b_oid
)) {
2475 /* Case B: Added in one. */
2476 /* [nothing|directory] -> ([nothing|directory], file) */
2478 const char *add_branch
;
2479 const char *other_branch
;
2481 const struct object_id
*oid
;
2485 add_branch
= o
->branch1
;
2486 other_branch
= o
->branch2
;
2489 conf
= _("file/directory");
2491 add_branch
= o
->branch2
;
2492 other_branch
= o
->branch1
;
2495 conf
= _("directory/file");
2497 if (dir_in_way(path
,
2498 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
2500 char *new_path
= unique_path(o
, path
, add_branch
);
2502 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
2504 conf
, path
, other_branch
, path
, new_path
);
2505 if (update_file(o
, 0, oid
, mode
, new_path
))
2507 else if (o
->call_depth
)
2508 remove_file_from_cache(path
);
2511 output(o
, 2, _("Adding %s"), path
);
2512 /* do not overwrite file if already present */
2513 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
2516 } else if (a_oid
&& b_oid
) {
2517 /* Case C: Added in both (check for same permissions) and */
2518 /* case D: Modified in both, but differently. */
2519 clean_merge
= merge_content(o
, path
,
2520 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
2522 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
2524 * this entry was deleted altogether. a_mode == 0 means
2525 * we had that path and want to actively remove it.
2527 remove_file(o
, 1, path
, !a_mode
);
2529 die("BUG: fatal merge failure, shouldn't happen.");
2534 int merge_trees(struct merge_options
*o
,
2537 struct tree
*common
,
2538 struct tree
**result
)
2542 if (o
->subtree_shift
) {
2543 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
2544 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
2547 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
2548 struct strbuf sb
= STRBUF_INIT
;
2550 if (!o
->call_depth
&& index_has_changes(&sb
)) {
2551 err(o
, _("Dirty index: cannot merge (dirty: %s)"),
2555 output(o
, 0, _("Already up to date!"));
2560 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
2563 if (show(o
, 4) || o
->call_depth
)
2564 err(o
, _("merging of trees %s and %s failed"),
2565 oid_to_hex(&head
->object
.oid
),
2566 oid_to_hex(&merge
->object
.oid
));
2570 if (unmerged_cache()) {
2571 struct string_list
*entries
;
2572 struct rename_info re_info
;
2575 * Only need the hashmap while processing entries, so
2576 * initialize it here and free it when we are done running
2577 * through the entries. Keeping it in the merge_options as
2578 * opposed to decaring a local hashmap is for convenience
2579 * so that we don't have to pass it to around.
2581 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
2582 get_files_dirs(o
, head
);
2583 get_files_dirs(o
, merge
);
2585 entries
= get_unmerged();
2586 clean
= handle_renames(o
, common
, head
, merge
, entries
,
2588 record_df_conflict_files(o
, entries
);
2591 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
2592 const char *path
= entries
->items
[i
].string
;
2593 struct stage_data
*e
= entries
->items
[i
].util
;
2594 if (!e
->processed
) {
2595 int ret
= process_entry(o
, path
, e
);
2604 for (i
= 0; i
< entries
->nr
; i
++) {
2605 struct stage_data
*e
= entries
->items
[i
].util
;
2607 die("BUG: unprocessed path??? %s",
2608 entries
->items
[i
].string
);
2612 final_cleanup_renames(&re_info
);
2614 string_list_clear(entries
, 1);
2617 hashmap_free(&o
->current_file_dir_set
, 1);
2625 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
2631 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
2633 struct commit_list
*next
= NULL
, *current
, *backup
;
2634 for (current
= list
; current
; current
= backup
) {
2635 backup
= current
->next
;
2636 current
->next
= next
;
2643 * Merge the commits h1 and h2, return the resulting virtual
2644 * commit object and a flag indicating the cleanness of the merge.
2646 int merge_recursive(struct merge_options
*o
,
2649 struct commit_list
*ca
,
2650 struct commit
**result
)
2652 struct commit_list
*iter
;
2653 struct commit
*merged_common_ancestors
;
2654 struct tree
*mrtree
;
2658 output(o
, 4, _("Merging:"));
2659 output_commit_title(o
, h1
);
2660 output_commit_title(o
, h2
);
2664 ca
= get_merge_bases(h1
, h2
);
2665 ca
= reverse_commit_list(ca
);
2669 unsigned cnt
= commit_list_count(ca
);
2671 output(o
, 5, Q_("found %u common ancestor:",
2672 "found %u common ancestors:", cnt
), cnt
);
2673 for (iter
= ca
; iter
; iter
= iter
->next
)
2674 output_commit_title(o
, iter
->item
);
2677 merged_common_ancestors
= pop_commit(&ca
);
2678 if (merged_common_ancestors
== NULL
) {
2679 /* if there is no common ancestor, use an empty tree */
2682 tree
= lookup_tree(the_hash_algo
->empty_tree
);
2683 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
2686 for (iter
= ca
; iter
; iter
= iter
->next
) {
2687 const char *saved_b1
, *saved_b2
;
2690 * When the merge fails, the result contains files
2691 * with conflict markers. The cleanness flag is
2692 * ignored (unless indicating an error), it was never
2693 * actually used, as result of merge_trees has always
2694 * overwritten it: the committed "conflicts" were
2698 saved_b1
= o
->branch1
;
2699 saved_b2
= o
->branch2
;
2700 o
->branch1
= "Temporary merge branch 1";
2701 o
->branch2
= "Temporary merge branch 2";
2702 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
2703 NULL
, &merged_common_ancestors
) < 0)
2705 o
->branch1
= saved_b1
;
2706 o
->branch2
= saved_b2
;
2709 if (!merged_common_ancestors
)
2710 return err(o
, _("merge returned no commit"));
2717 o
->ancestor
= "merged common ancestors";
2718 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
2725 if (o
->call_depth
) {
2726 *result
= make_virtual_commit(mrtree
, "merged tree");
2727 commit_list_insert(h1
, &(*result
)->parents
);
2728 commit_list_insert(h2
, &(*result
)->parents
->next
);
2731 if (!o
->call_depth
&& o
->buffer_output
< 2)
2732 strbuf_release(&o
->obuf
);
2734 diff_warn_rename_limit("merge.renamelimit",
2735 o
->needed_rename_limit
, 0);
2739 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
2741 struct object
*object
;
2743 object
= deref_tag(parse_object(oid
), name
, strlen(name
));
2746 if (object
->type
== OBJ_TREE
)
2747 return make_virtual_commit((struct tree
*)object
, name
);
2748 if (object
->type
!= OBJ_COMMIT
)
2750 if (parse_commit((struct commit
*)object
))
2752 return (struct commit
*)object
;
2755 int merge_recursive_generic(struct merge_options
*o
,
2756 const struct object_id
*head
,
2757 const struct object_id
*merge
,
2759 const struct object_id
**base_list
,
2760 struct commit
**result
)
2763 struct lock_file lock
= LOCK_INIT
;
2764 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
2765 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
2766 struct commit_list
*ca
= NULL
;
2770 for (i
= 0; i
< num_base_list
; ++i
) {
2771 struct commit
*base
;
2772 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
2773 return err(o
, _("Could not parse object '%s'"),
2774 oid_to_hex(base_list
[i
]));
2775 commit_list_insert(base
, &ca
);
2779 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
2780 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
2783 rollback_lock_file(&lock
);
2787 if (write_locked_index(&the_index
, &lock
,
2788 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
2789 return err(o
, _("Unable to write index."));
2791 return clean
? 0 : 1;
2794 static void merge_recursive_config(struct merge_options
*o
)
2796 git_config_get_int("merge.verbosity", &o
->verbosity
);
2797 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
2798 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
2799 git_config(git_xmerge_config
, NULL
);
2802 void init_merge_options(struct merge_options
*o
)
2804 const char *merge_verbosity
;
2805 memset(o
, 0, sizeof(struct merge_options
));
2807 o
->buffer_output
= 1;
2808 o
->diff_rename_limit
= -1;
2809 o
->merge_rename_limit
= -1;
2811 o
->detect_rename
= 1;
2812 merge_recursive_config(o
);
2813 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
2814 if (merge_verbosity
)
2815 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
2816 if (o
->verbosity
>= 5)
2817 o
->buffer_output
= 0;
2818 strbuf_init(&o
->obuf
, 0);
2819 string_list_init(&o
->df_conflict_file_set
, 1);
2822 int parse_merge_opt(struct merge_options
*o
, const char *s
)
2828 if (!strcmp(s
, "ours"))
2829 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
2830 else if (!strcmp(s
, "theirs"))
2831 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
2832 else if (!strcmp(s
, "subtree"))
2833 o
->subtree_shift
= "";
2834 else if (skip_prefix(s
, "subtree=", &arg
))
2835 o
->subtree_shift
= arg
;
2836 else if (!strcmp(s
, "patience"))
2837 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
2838 else if (!strcmp(s
, "histogram"))
2839 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
2840 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
2841 long value
= parse_algorithm_value(arg
);
2844 /* clear out previous settings */
2845 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
2846 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
2847 o
->xdl_opts
|= value
;
2849 else if (!strcmp(s
, "ignore-space-change"))
2850 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
2851 else if (!strcmp(s
, "ignore-all-space"))
2852 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
2853 else if (!strcmp(s
, "ignore-space-at-eol"))
2854 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
2855 else if (!strcmp(s
, "ignore-cr-at-eol"))
2856 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
2857 else if (!strcmp(s
, "renormalize"))
2859 else if (!strcmp(s
, "no-renormalize"))
2861 else if (!strcmp(s
, "no-renames"))
2862 o
->detect_rename
= 0;
2863 else if (!strcmp(s
, "find-renames")) {
2864 o
->detect_rename
= 1;
2865 o
->rename_score
= 0;
2867 else if (skip_prefix(s
, "find-renames=", &arg
) ||
2868 skip_prefix(s
, "rename-threshold=", &arg
)) {
2869 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
2871 o
->detect_rename
= 1;