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"
11 #include "object-store.h"
12 #include "repository.h"
16 #include "tree-walk.h"
21 #include "unpack-trees.h"
22 #include "string-list.h"
23 #include "xdiff-interface.h"
26 #include "merge-recursive.h"
28 #include "submodule.h"
30 #include "commit-reach.h"
32 struct path_hashmap_entry
{
33 struct hashmap_entry e
;
34 char path
[FLEX_ARRAY
];
37 static int path_hashmap_cmp(const void *cmp_data
,
39 const void *entry_or_key
,
42 const struct path_hashmap_entry
*a
= entry
;
43 const struct path_hashmap_entry
*b
= entry_or_key
;
44 const char *key
= keydata
;
47 return strcasecmp(a
->path
, key
? key
: b
->path
);
49 return strcmp(a
->path
, key
? key
: b
->path
);
52 static unsigned int path_hash(const char *path
)
54 return ignore_case
? strihash(path
) : strhash(path
);
57 static struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
60 struct dir_rename_entry key
;
64 hashmap_entry_init(&key
, strhash(dir
));
66 return hashmap_get(hashmap
, &key
, NULL
);
69 static int dir_rename_cmp(const void *unused_cmp_data
,
71 const void *entry_or_key
,
72 const void *unused_keydata
)
74 const struct dir_rename_entry
*e1
= entry
;
75 const struct dir_rename_entry
*e2
= entry_or_key
;
77 return strcmp(e1
->dir
, e2
->dir
);
80 static void dir_rename_init(struct hashmap
*map
)
82 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
85 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
88 hashmap_entry_init(entry
, strhash(directory
));
89 entry
->dir
= directory
;
90 entry
->non_unique_new_dir
= 0;
91 strbuf_init(&entry
->new_dir
, 0);
92 string_list_init(&entry
->possible_new_dirs
, 0);
95 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
98 struct collision_entry key
;
100 hashmap_entry_init(&key
, strhash(target_file
));
101 key
.target_file
= target_file
;
102 return hashmap_get(hashmap
, &key
, NULL
);
105 static int collision_cmp(void *unused_cmp_data
,
106 const struct collision_entry
*e1
,
107 const struct collision_entry
*e2
,
108 const void *unused_keydata
)
110 return strcmp(e1
->target_file
, e2
->target_file
);
113 static void collision_init(struct hashmap
*map
)
115 hashmap_init(map
, (hashmap_cmp_fn
) collision_cmp
, NULL
, 0);
118 static void flush_output(struct merge_options
*opt
)
120 if (opt
->buffer_output
< 2 && opt
->obuf
.len
) {
121 fputs(opt
->obuf
.buf
, stdout
);
122 strbuf_reset(&opt
->obuf
);
126 static int err(struct merge_options
*opt
, const char *err
, ...)
130 if (opt
->buffer_output
< 2)
133 strbuf_complete(&opt
->obuf
, '\n');
134 strbuf_addstr(&opt
->obuf
, "error: ");
136 va_start(params
, err
);
137 strbuf_vaddf(&opt
->obuf
, err
, params
);
139 if (opt
->buffer_output
> 1)
140 strbuf_addch(&opt
->obuf
, '\n');
142 error("%s", opt
->obuf
.buf
);
143 strbuf_reset(&opt
->obuf
);
149 static struct tree
*shift_tree_object(struct repository
*repo
,
150 struct tree
*one
, struct tree
*two
,
151 const char *subtree_shift
)
153 struct object_id shifted
;
155 if (!*subtree_shift
) {
156 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
158 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
161 if (oideq(&two
->object
.oid
, &shifted
))
163 return lookup_tree(repo
, &shifted
);
166 static struct commit
*make_virtual_commit(struct repository
*repo
,
170 struct commit
*commit
= alloc_commit_node(repo
);
172 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
173 commit
->maybe_tree
= tree
;
174 commit
->object
.parsed
= 1;
179 * Since we use get_tree_entry(), which does not put the read object into
180 * the object pool, we cannot rely on a == b.
182 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
186 return a
&& b
&& oideq(a
, b
);
194 RENAME_ONE_FILE_TO_ONE
,
195 RENAME_ONE_FILE_TO_TWO
,
196 RENAME_TWO_FILES_TO_ONE
200 * Since we want to write the index eventually, we cannot reuse the index
201 * for these (temporary) data.
204 struct diff_filespec stages
[4]; /* mostly for oid & mode; maybe path */
205 struct rename_conflict_info
*rename_conflict_info
;
206 unsigned processed
:1;
210 unsigned processed
:1;
211 struct diff_filepair
*pair
;
212 const char *branch
; /* branch that the rename occurred on */
214 * If directory rename detection affected this rename, what was its
215 * original type ('A' or 'R') and it's original destination before
216 * the directory rename (otherwise, '\0' and NULL for these two vars).
218 char dir_rename_original_type
;
219 char *dir_rename_original_dest
;
221 * Purpose of src_entry and dst_entry:
223 * If 'before' is renamed to 'after' then src_entry will contain
224 * the versions of 'before' from the merge_base, HEAD, and MERGE in
225 * stages 1, 2, and 3; dst_entry will contain the respective
226 * versions of 'after' in corresponding locations. Thus, we have a
227 * total of six modes and oids, though some will be null. (Stage 0
228 * is ignored; we're interested in handling conflicts.)
230 * Since we don't turn on break-rewrites by default, neither
231 * src_entry nor dst_entry can have all three of their stages have
232 * non-null oids, meaning at most four of the six will be non-null.
233 * Also, since this is a rename, both src_entry and dst_entry will
234 * have at least one non-null oid, meaning at least two will be
235 * non-null. Of the six oids, a typical rename will have three be
236 * non-null. Only two implies a rename/delete, and four implies a
239 struct stage_data
*src_entry
;
240 struct stage_data
*dst_entry
;
243 struct rename_conflict_info
{
244 enum rename_type rename_type
;
249 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
250 struct merge_options
*opt
,
254 struct rename_conflict_info
*ci
;
257 * When we have two renames involved, it's easiest to get the
258 * correct things into stage 2 and 3, and to make sure that the
259 * content merge puts HEAD before the other branch if we just
260 * ensure that branch1 == opt->branch1. So, simply flip arguments
261 * around if we don't have that.
263 if (ren2
&& ren1
->branch
!= opt
->branch1
) {
264 setup_rename_conflict_info(rename_type
, opt
, ren2
, ren1
);
268 ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
269 ci
->rename_type
= rename_type
;
273 ci
->ren1
->dst_entry
->processed
= 0;
274 ci
->ren1
->dst_entry
->rename_conflict_info
= ci
;
276 ci
->ren2
->dst_entry
->rename_conflict_info
= ci
;
280 static int show(struct merge_options
*opt
, int v
)
282 return (!opt
->call_depth
&& opt
->verbosity
>= v
) || opt
->verbosity
>= 5;
285 __attribute__((format (printf
, 3, 4)))
286 static void output(struct merge_options
*opt
, int v
, const char *fmt
, ...)
293 strbuf_addchars(&opt
->obuf
, ' ', opt
->call_depth
* 2);
296 strbuf_vaddf(&opt
->obuf
, fmt
, ap
);
299 strbuf_addch(&opt
->obuf
, '\n');
300 if (!opt
->buffer_output
)
304 static void output_commit_title(struct merge_options
*opt
, struct commit
*commit
)
306 struct merge_remote_desc
*desc
;
308 strbuf_addchars(&opt
->obuf
, ' ', opt
->call_depth
* 2);
309 desc
= merge_remote_util(commit
);
311 strbuf_addf(&opt
->obuf
, "virtual %s\n", desc
->name
);
313 strbuf_add_unique_abbrev(&opt
->obuf
, &commit
->object
.oid
,
315 strbuf_addch(&opt
->obuf
, ' ');
316 if (parse_commit(commit
) != 0)
317 strbuf_addstr(&opt
->obuf
, _("(bad commit)\n"));
320 const char *msg
= get_commit_buffer(commit
, NULL
);
321 int len
= find_commit_subject(msg
, &title
);
323 strbuf_addf(&opt
->obuf
, "%.*s\n", len
, title
);
324 unuse_commit_buffer(commit
, msg
);
330 static int add_cacheinfo(struct merge_options
*opt
,
331 const struct diff_filespec
*blob
,
332 const char *path
, int stage
, int refresh
, int options
)
334 struct index_state
*istate
= opt
->repo
->index
;
335 struct cache_entry
*ce
;
338 ce
= make_cache_entry(istate
, blob
->mode
, &blob
->oid
, path
, stage
, 0);
340 return err(opt
, _("add_cacheinfo failed for path '%s'; merge aborting."), path
);
342 ret
= add_index_entry(istate
, ce
, options
);
344 struct cache_entry
*nce
;
346 nce
= refresh_cache_entry(istate
, ce
,
347 CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
349 return err(opt
, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path
);
351 ret
= add_index_entry(istate
, nce
, options
);
356 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
359 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
362 static int unpack_trees_start(struct merge_options
*opt
,
368 struct tree_desc t
[3];
369 struct index_state tmp_index
= { NULL
};
371 memset(&opt
->unpack_opts
, 0, sizeof(opt
->unpack_opts
));
373 opt
->unpack_opts
.index_only
= 1;
375 opt
->unpack_opts
.update
= 1;
376 opt
->unpack_opts
.merge
= 1;
377 opt
->unpack_opts
.head_idx
= 2;
378 opt
->unpack_opts
.fn
= threeway_merge
;
379 opt
->unpack_opts
.src_index
= opt
->repo
->index
;
380 opt
->unpack_opts
.dst_index
= &tmp_index
;
381 opt
->unpack_opts
.aggressive
= !merge_detect_rename(opt
);
382 setup_unpack_trees_porcelain(&opt
->unpack_opts
, "merge");
384 init_tree_desc_from_tree(t
+0, common
);
385 init_tree_desc_from_tree(t
+1, head
);
386 init_tree_desc_from_tree(t
+2, merge
);
388 rc
= unpack_trees(3, t
, &opt
->unpack_opts
);
389 cache_tree_free(&opt
->repo
->index
->cache_tree
);
392 * Update opt->repo->index to match the new results, AFTER saving a copy
393 * in opt->orig_index. Update src_index to point to the saved copy.
394 * (verify_uptodate() checks src_index, and the original index is
395 * the one that had the necessary modification timestamps.)
397 opt
->orig_index
= *opt
->repo
->index
;
398 *opt
->repo
->index
= tmp_index
;
399 opt
->unpack_opts
.src_index
= &opt
->orig_index
;
404 static void unpack_trees_finish(struct merge_options
*opt
)
406 discard_index(&opt
->orig_index
);
407 clear_unpack_trees_porcelain(&opt
->unpack_opts
);
410 struct tree
*write_tree_from_memory(struct merge_options
*opt
)
412 struct tree
*result
= NULL
;
413 struct index_state
*istate
= opt
->repo
->index
;
415 if (unmerged_index(istate
)) {
417 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
418 for (i
= 0; i
< istate
->cache_nr
; i
++) {
419 const struct cache_entry
*ce
= istate
->cache
[i
];
421 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
422 (int)ce_namelen(ce
), ce
->name
);
424 BUG("unmerged index entries in merge-recursive.c");
427 if (!istate
->cache_tree
)
428 istate
->cache_tree
= cache_tree();
430 if (!cache_tree_fully_valid(istate
->cache_tree
) &&
431 cache_tree_update(istate
, 0) < 0) {
432 err(opt
, _("error building trees"));
436 result
= lookup_tree(opt
->repo
, &istate
->cache_tree
->oid
);
441 static int save_files_dirs(const struct object_id
*oid
,
442 struct strbuf
*base
, const char *path
,
443 unsigned int mode
, int stage
, void *context
)
445 struct path_hashmap_entry
*entry
;
446 int baselen
= base
->len
;
447 struct merge_options
*opt
= context
;
449 strbuf_addstr(base
, path
);
451 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
452 hashmap_entry_init(entry
, path_hash(entry
->path
));
453 hashmap_add(&opt
->current_file_dir_set
, entry
);
455 strbuf_setlen(base
, baselen
);
456 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
459 static void get_files_dirs(struct merge_options
*opt
, struct tree
*tree
)
461 struct pathspec match_all
;
462 memset(&match_all
, 0, sizeof(match_all
));
463 read_tree_recursive(the_repository
, tree
, "", 0, 0,
464 &match_all
, save_files_dirs
, opt
);
467 static int get_tree_entry_if_blob(const struct object_id
*tree
,
469 struct diff_filespec
*dfs
)
473 ret
= get_tree_entry(tree
, path
, &dfs
->oid
, &dfs
->mode
);
474 if (S_ISDIR(dfs
->mode
)) {
475 oidcpy(&dfs
->oid
, &null_oid
);
482 * Returns an index_entry instance which doesn't have to correspond to
483 * a real cache entry in Git's index.
485 static struct stage_data
*insert_stage_data(const char *path
,
486 struct tree
*o
, struct tree
*a
, struct tree
*b
,
487 struct string_list
*entries
)
489 struct string_list_item
*item
;
490 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
491 get_tree_entry_if_blob(&o
->object
.oid
, path
, &e
->stages
[1]);
492 get_tree_entry_if_blob(&a
->object
.oid
, path
, &e
->stages
[2]);
493 get_tree_entry_if_blob(&b
->object
.oid
, path
, &e
->stages
[3]);
494 item
= string_list_insert(entries
, path
);
500 * Create a dictionary mapping file names to stage_data objects. The
501 * dictionary contains one entry for every path with a non-zero stage entry.
503 static struct string_list
*get_unmerged(struct index_state
*istate
)
505 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
508 unmerged
->strdup_strings
= 1;
510 for (i
= 0; i
< istate
->cache_nr
; i
++) {
511 struct string_list_item
*item
;
512 struct stage_data
*e
;
513 const struct cache_entry
*ce
= istate
->cache
[i
];
517 item
= string_list_lookup(unmerged
, ce
->name
);
519 item
= string_list_insert(unmerged
, ce
->name
);
520 item
->util
= xcalloc(1, sizeof(struct stage_data
));
523 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
524 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
530 static int string_list_df_name_compare(const char *one
, const char *two
)
532 int onelen
= strlen(one
);
533 int twolen
= strlen(two
);
535 * Here we only care that entries for D/F conflicts are
536 * adjacent, in particular with the file of the D/F conflict
537 * appearing before files below the corresponding directory.
538 * The order of the rest of the list is irrelevant for us.
540 * To achieve this, we sort with df_name_compare and provide
541 * the mode S_IFDIR so that D/F conflicts will sort correctly.
542 * We use the mode S_IFDIR for everything else for simplicity,
543 * since in other cases any changes in their order due to
544 * sorting cause no problems for us.
546 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
547 two
, twolen
, S_IFDIR
);
549 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
550 * that 'foo' comes before 'foo/bar'.
554 return onelen
- twolen
;
557 static void record_df_conflict_files(struct merge_options
*opt
,
558 struct string_list
*entries
)
560 /* If there is a D/F conflict and the file for such a conflict
561 * currently exists in the working tree, we want to allow it to be
562 * removed to make room for the corresponding directory if needed.
563 * The files underneath the directories of such D/F conflicts will
564 * be processed before the corresponding file involved in the D/F
565 * conflict. If the D/F directory ends up being removed by the
566 * merge, then we won't have to touch the D/F file. If the D/F
567 * directory needs to be written to the working copy, then the D/F
568 * file will simply be removed (in make_room_for_path()) to make
569 * room for the necessary paths. Note that if both the directory
570 * and the file need to be present, then the D/F file will be
571 * reinstated with a new unique name at the time it is processed.
573 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
574 const char *last_file
= NULL
;
579 * If we're merging merge-bases, we don't want to bother with
580 * any working directory changes.
585 /* Ensure D/F conflicts are adjacent in the entries list. */
586 for (i
= 0; i
< entries
->nr
; i
++) {
587 struct string_list_item
*next
= &entries
->items
[i
];
588 string_list_append(&df_sorted_entries
, next
->string
)->util
=
591 df_sorted_entries
.cmp
= string_list_df_name_compare
;
592 string_list_sort(&df_sorted_entries
);
594 string_list_clear(&opt
->df_conflict_file_set
, 1);
595 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
596 const char *path
= df_sorted_entries
.items
[i
].string
;
597 int len
= strlen(path
);
598 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
601 * Check if last_file & path correspond to a D/F conflict;
602 * i.e. whether path is last_file+'/'+<something>.
603 * If so, record that it's okay to remove last_file to make
604 * room for path and friends if needed.
608 memcmp(path
, last_file
, last_len
) == 0 &&
609 path
[last_len
] == '/') {
610 string_list_insert(&opt
->df_conflict_file_set
, last_file
);
614 * Determine whether path could exist as a file in the
615 * working directory as a possible D/F conflict. This
616 * will only occur when it exists in stage 2 as a
619 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
626 string_list_clear(&df_sorted_entries
, 0);
629 static int update_stages(struct merge_options
*opt
, const char *path
,
630 const struct diff_filespec
*o
,
631 const struct diff_filespec
*a
,
632 const struct diff_filespec
*b
)
636 * NOTE: It is usually a bad idea to call update_stages on a path
637 * before calling update_file on that same path, since it can
638 * sometimes lead to spurious "refusing to lose untracked file..."
639 * messages from update_file (via make_room_for path via
640 * would_lose_untracked). Instead, reverse the order of the calls
641 * (executing update_file first and then update_stages).
644 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
646 if (remove_file_from_index(opt
->repo
->index
, path
))
649 if (add_cacheinfo(opt
, o
, path
, 1, 0, options
))
652 if (add_cacheinfo(opt
, a
, path
, 2, 0, options
))
655 if (add_cacheinfo(opt
, b
, path
, 3, 0, options
))
660 static void update_entry(struct stage_data
*entry
,
661 struct diff_filespec
*o
,
662 struct diff_filespec
*a
,
663 struct diff_filespec
*b
)
665 entry
->processed
= 0;
666 entry
->stages
[1].mode
= o
->mode
;
667 entry
->stages
[2].mode
= a
->mode
;
668 entry
->stages
[3].mode
= b
->mode
;
669 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
670 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
671 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
674 static int remove_file(struct merge_options
*opt
, int clean
,
675 const char *path
, int no_wd
)
677 int update_cache
= opt
->call_depth
|| clean
;
678 int update_working_directory
= !opt
->call_depth
&& !no_wd
;
681 if (remove_file_from_index(opt
->repo
->index
, path
))
684 if (update_working_directory
) {
686 struct cache_entry
*ce
;
687 ce
= index_file_exists(opt
->repo
->index
, path
, strlen(path
),
689 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
692 if (remove_path(path
))
698 /* add a string to a strbuf, but converting "/" to "_" */
699 static void add_flattened_path(struct strbuf
*out
, const char *s
)
702 strbuf_addstr(out
, s
);
703 for (; i
< out
->len
; i
++)
704 if (out
->buf
[i
] == '/')
708 static char *unique_path(struct merge_options
*opt
, const char *path
, const char *branch
)
710 struct path_hashmap_entry
*entry
;
711 struct strbuf newpath
= STRBUF_INIT
;
715 strbuf_addf(&newpath
, "%s~", path
);
716 add_flattened_path(&newpath
, branch
);
718 base_len
= newpath
.len
;
719 while (hashmap_get_from_hash(&opt
->current_file_dir_set
,
720 path_hash(newpath
.buf
), newpath
.buf
) ||
721 (!opt
->call_depth
&& file_exists(newpath
.buf
))) {
722 strbuf_setlen(&newpath
, base_len
);
723 strbuf_addf(&newpath
, "_%d", suffix
++);
726 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
727 hashmap_entry_init(entry
, path_hash(entry
->path
));
728 hashmap_add(&opt
->current_file_dir_set
, entry
);
729 return strbuf_detach(&newpath
, NULL
);
733 * Check whether a directory in the index is in the way of an incoming
734 * file. Return 1 if so. If check_working_copy is non-zero, also
735 * check the working directory. If empty_ok is non-zero, also return
736 * 0 in the case where the working-tree dir exists but is empty.
738 static int dir_in_way(struct index_state
*istate
, const char *path
,
739 int check_working_copy
, int empty_ok
)
742 struct strbuf dirpath
= STRBUF_INIT
;
745 strbuf_addstr(&dirpath
, path
);
746 strbuf_addch(&dirpath
, '/');
748 pos
= index_name_pos(istate
, dirpath
.buf
, dirpath
.len
);
752 if (pos
< istate
->cache_nr
&&
753 !strncmp(dirpath
.buf
, istate
->cache
[pos
]->name
, dirpath
.len
)) {
754 strbuf_release(&dirpath
);
758 strbuf_release(&dirpath
);
759 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
760 !(empty_ok
&& is_empty_dir(path
));
764 * Returns whether path was tracked in the index before the merge started,
765 * and its oid and mode match the specified values
767 static int was_tracked_and_matches(struct merge_options
*opt
, const char *path
,
768 const struct diff_filespec
*blob
)
770 int pos
= index_name_pos(&opt
->orig_index
, path
, strlen(path
));
771 struct cache_entry
*ce
;
774 /* we were not tracking this path before the merge */
777 /* See if the file we were tracking before matches */
778 ce
= opt
->orig_index
.cache
[pos
];
779 return (oid_eq(&ce
->oid
, &blob
->oid
) && ce
->ce_mode
== blob
->mode
);
783 * Returns whether path was tracked in the index before the merge started
785 static int was_tracked(struct merge_options
*opt
, const char *path
)
787 int pos
= index_name_pos(&opt
->orig_index
, path
, strlen(path
));
790 /* we were tracking this path before the merge */
796 static int would_lose_untracked(struct merge_options
*opt
, const char *path
)
798 struct index_state
*istate
= opt
->repo
->index
;
801 * This may look like it can be simplified to:
802 * return !was_tracked(opt, path) && file_exists(path)
803 * but it can't. This function needs to know whether path was in
804 * the working tree due to EITHER having been tracked in the index
805 * before the merge OR having been put into the working copy and
806 * index by unpack_trees(). Due to that either-or requirement, we
807 * check the current index instead of the original one.
809 * Note that we do not need to worry about merge-recursive itself
810 * updating the index after unpack_trees() and before calling this
811 * function, because we strictly require all code paths in
812 * merge-recursive to update the working tree first and the index
813 * second. Doing otherwise would break
814 * update_file()/would_lose_untracked(); see every comment in this
815 * file which mentions "update_stages".
817 int pos
= index_name_pos(istate
, path
, strlen(path
));
821 while (pos
< istate
->cache_nr
&&
822 !strcmp(path
, istate
->cache
[pos
]->name
)) {
824 * If stage #0, it is definitely tracked.
825 * If it has stage #2 then it was tracked
826 * before this merge started. All other
827 * cases the path was not tracked.
829 switch (ce_stage(istate
->cache
[pos
])) {
836 return file_exists(path
);
839 static int was_dirty(struct merge_options
*opt
, const char *path
)
841 struct cache_entry
*ce
;
844 if (opt
->call_depth
|| !was_tracked(opt
, path
))
847 ce
= index_file_exists(opt
->unpack_opts
.src_index
,
848 path
, strlen(path
), ignore_case
);
849 dirty
= verify_uptodate(ce
, &opt
->unpack_opts
) != 0;
853 static int make_room_for_path(struct merge_options
*opt
, const char *path
)
856 const char *msg
= _("failed to create path '%s'%s");
858 /* Unlink any D/F conflict files that are in the way */
859 for (i
= 0; i
< opt
->df_conflict_file_set
.nr
; i
++) {
860 const char *df_path
= opt
->df_conflict_file_set
.items
[i
].string
;
861 size_t pathlen
= strlen(path
);
862 size_t df_pathlen
= strlen(df_path
);
863 if (df_pathlen
< pathlen
&&
864 path
[df_pathlen
] == '/' &&
865 strncmp(path
, df_path
, df_pathlen
) == 0) {
867 _("Removing %s to make room for subdirectory\n"),
870 unsorted_string_list_delete_item(&opt
->df_conflict_file_set
,
876 /* Make sure leading directories are created */
877 status
= safe_create_leading_directories_const(path
);
879 if (status
== SCLD_EXISTS
)
880 /* something else exists */
881 return err(opt
, msg
, path
, _(": perhaps a D/F conflict?"));
882 return err(opt
, msg
, path
, "");
886 * Do not unlink a file in the work tree if we are not
889 if (would_lose_untracked(opt
, path
))
890 return err(opt
, _("refusing to lose untracked file at '%s'"),
893 /* Successful unlink is good.. */
896 /* .. and so is no existing file */
899 /* .. but not some other error (who really cares what?) */
900 return err(opt
, msg
, path
, _(": perhaps a D/F conflict?"));
903 static int update_file_flags(struct merge_options
*opt
,
904 const struct diff_filespec
*contents
,
915 enum object_type type
;
919 if (S_ISGITLINK(contents
->mode
)) {
921 * We may later decide to recursively descend into
922 * the submodule directory and update its index
923 * and/or work tree, but we do not do that now.
929 buf
= read_object_file(&contents
->oid
, &type
, &size
);
931 return err(opt
, _("cannot read object %s '%s'"),
932 oid_to_hex(&contents
->oid
), path
);
933 if (type
!= OBJ_BLOB
) {
934 ret
= err(opt
, _("blob expected for %s '%s'"),
935 oid_to_hex(&contents
->oid
), path
);
938 if (S_ISREG(contents
->mode
)) {
939 struct strbuf strbuf
= STRBUF_INIT
;
940 if (convert_to_working_tree(opt
->repo
->index
, path
, buf
, size
, &strbuf
)) {
943 buf
= strbuf_detach(&strbuf
, NULL
);
947 if (make_room_for_path(opt
, path
) < 0) {
951 if (S_ISREG(contents
->mode
) ||
952 (!has_symlinks
&& S_ISLNK(contents
->mode
))) {
954 int mode
= (contents
->mode
& 0100 ? 0777 : 0666);
956 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
958 ret
= err(opt
, _("failed to open '%s': %s"),
959 path
, strerror(errno
));
962 write_in_full(fd
, buf
, size
);
964 } else if (S_ISLNK(contents
->mode
)) {
965 char *lnk
= xmemdupz(buf
, size
);
966 safe_create_leading_directories_const(path
);
968 if (symlink(lnk
, path
))
969 ret
= err(opt
, _("failed to symlink '%s': %s"),
970 path
, strerror(errno
));
974 _("do not know what to do with %06o %s '%s'"),
975 contents
->mode
, oid_to_hex(&contents
->oid
), path
);
980 if (!ret
&& update_cache
)
981 if (add_cacheinfo(opt
, contents
, path
, 0, update_wd
,
982 ADD_CACHE_OK_TO_ADD
))
987 static int update_file(struct merge_options
*opt
,
989 const struct diff_filespec
*contents
,
992 return update_file_flags(opt
, contents
, path
,
993 opt
->call_depth
|| clean
, !opt
->call_depth
);
996 /* Low level file merging, update and removal */
998 struct merge_file_info
{
999 struct diff_filespec blob
; /* mostly use oid & mode; sometimes path */
1004 static int merge_3way(struct merge_options
*opt
,
1005 mmbuffer_t
*result_buf
,
1006 const struct diff_filespec
*o
,
1007 const struct diff_filespec
*a
,
1008 const struct diff_filespec
*b
,
1009 const char *branch1
,
1010 const char *branch2
,
1011 const int extra_marker_size
)
1013 mmfile_t orig
, src1
, src2
;
1014 struct ll_merge_options ll_opts
= {0};
1015 char *base_name
, *name1
, *name2
;
1018 ll_opts
.renormalize
= opt
->renormalize
;
1019 ll_opts
.extra_marker_size
= extra_marker_size
;
1020 ll_opts
.xdl_opts
= opt
->xdl_opts
;
1022 if (opt
->call_depth
) {
1023 ll_opts
.virtual_ancestor
= 1;
1024 ll_opts
.variant
= 0;
1026 switch (opt
->recursive_variant
) {
1027 case MERGE_RECURSIVE_OURS
:
1028 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
1030 case MERGE_RECURSIVE_THEIRS
:
1031 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
1034 ll_opts
.variant
= 0;
1039 assert(a
->path
&& b
->path
);
1040 if (strcmp(a
->path
, b
->path
) ||
1041 (opt
->ancestor
!= NULL
&& strcmp(a
->path
, o
->path
) != 0)) {
1042 base_name
= opt
->ancestor
== NULL
? NULL
:
1043 mkpathdup("%s:%s", opt
->ancestor
, o
->path
);
1044 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
1045 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
1047 base_name
= opt
->ancestor
== NULL
? NULL
:
1048 mkpathdup("%s", opt
->ancestor
);
1049 name1
= mkpathdup("%s", branch1
);
1050 name2
= mkpathdup("%s", branch2
);
1053 read_mmblob(&orig
, &o
->oid
);
1054 read_mmblob(&src1
, &a
->oid
);
1055 read_mmblob(&src2
, &b
->oid
);
1057 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
1058 &src1
, name1
, &src2
, name2
,
1059 opt
->repo
->index
, &ll_opts
);
1067 return merge_status
;
1070 static int find_first_merges(struct repository
*repo
,
1071 struct object_array
*result
, const char *path
,
1072 struct commit
*a
, struct commit
*b
)
1075 struct object_array merges
= OBJECT_ARRAY_INIT
;
1076 struct commit
*commit
;
1077 int contains_another
;
1079 char merged_revision
[42];
1080 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1081 "--all", merged_revision
, NULL
};
1082 struct rev_info revs
;
1083 struct setup_revision_opt rev_opts
;
1085 memset(result
, 0, sizeof(struct object_array
));
1086 memset(&rev_opts
, 0, sizeof(rev_opts
));
1088 /* get all revisions that merge commit a */
1089 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1090 oid_to_hex(&a
->object
.oid
));
1091 repo_init_revisions(repo
, &revs
, NULL
);
1092 rev_opts
.submodule
= path
;
1093 /* FIXME: can't handle linked worktrees in submodules yet */
1094 revs
.single_worktree
= path
!= NULL
;
1095 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1097 /* save all revisions from the above list that contain b */
1098 if (prepare_revision_walk(&revs
))
1099 die("revision walk setup failed");
1100 while ((commit
= get_revision(&revs
)) != NULL
) {
1101 struct object
*o
= &(commit
->object
);
1102 if (in_merge_bases(b
, commit
))
1103 add_object_array(o
, NULL
, &merges
);
1105 reset_revision_walk();
1107 /* Now we've got all merges that contain a and b. Prune all
1108 * merges that contain another found merge and save them in
1111 for (i
= 0; i
< merges
.nr
; i
++) {
1112 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1114 contains_another
= 0;
1115 for (j
= 0; j
< merges
.nr
; j
++) {
1116 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1117 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1118 contains_another
= 1;
1123 if (!contains_another
)
1124 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1127 object_array_clear(&merges
);
1131 static void print_commit(struct commit
*commit
)
1133 struct strbuf sb
= STRBUF_INIT
;
1134 struct pretty_print_context ctx
= {0};
1135 ctx
.date_mode
.type
= DATE_NORMAL
;
1136 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1137 fprintf(stderr
, "%s\n", sb
.buf
);
1138 strbuf_release(&sb
);
1141 static int is_valid(const struct diff_filespec
*dfs
)
1143 return dfs
->mode
!= 0 && !is_null_oid(&dfs
->oid
);
1146 static int merge_submodule(struct merge_options
*opt
,
1147 struct object_id
*result
, const char *path
,
1148 const struct object_id
*base
, const struct object_id
*a
,
1149 const struct object_id
*b
)
1151 struct commit
*commit_base
, *commit_a
, *commit_b
;
1153 struct object_array merges
;
1156 int search
= !opt
->call_depth
;
1158 /* store a in result in case we fail */
1161 /* we can not handle deletion conflicts */
1162 if (is_null_oid(base
))
1169 if (add_submodule_odb(path
)) {
1170 output(opt
, 1, _("Failed to merge submodule %s (not checked out)"), path
);
1174 if (!(commit_base
= lookup_commit_reference(opt
->repo
, base
)) ||
1175 !(commit_a
= lookup_commit_reference(opt
->repo
, a
)) ||
1176 !(commit_b
= lookup_commit_reference(opt
->repo
, b
))) {
1177 output(opt
, 1, _("Failed to merge submodule %s (commits not present)"), path
);
1181 /* check whether both changes are forward */
1182 if (!in_merge_bases(commit_base
, commit_a
) ||
1183 !in_merge_bases(commit_base
, commit_b
)) {
1184 output(opt
, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path
);
1188 /* Case #1: a is contained in b or vice versa */
1189 if (in_merge_bases(commit_a
, commit_b
)) {
1192 output(opt
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1193 output_commit_title(opt
, commit_b
);
1194 } else if (show(opt
, 2))
1195 output(opt
, 2, _("Fast-forwarding submodule %s"), path
);
1201 if (in_merge_bases(commit_b
, commit_a
)) {
1204 output(opt
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1205 output_commit_title(opt
, commit_a
);
1206 } else if (show(opt
, 2))
1207 output(opt
, 2, _("Fast-forwarding submodule %s"), path
);
1215 * Case #2: There are one or more merges that contain a and b in
1216 * the submodule. If there is only one, then present it as a
1217 * suggestion to the user, but leave it marked unmerged so the
1218 * user needs to confirm the resolution.
1221 /* Skip the search if makes no sense to the calling context. */
1225 /* find commit which merges them */
1226 parent_count
= find_first_merges(opt
->repo
, &merges
, path
,
1227 commit_a
, commit_b
);
1228 switch (parent_count
) {
1230 output(opt
, 1, _("Failed to merge submodule %s (merge following commits not found)"), path
);
1234 output(opt
, 1, _("Failed to merge submodule %s (not fast-forward)"), path
);
1235 output(opt
, 2, _("Found a possible merge resolution for the submodule:\n"));
1236 print_commit((struct commit
*) merges
.objects
[0].item
);
1238 "If this is correct simply add it to the index "
1241 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1242 "which will accept this suggestion.\n"),
1243 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1247 output(opt
, 1, _("Failed to merge submodule %s (multiple merges found)"), path
);
1248 for (i
= 0; i
< merges
.nr
; i
++)
1249 print_commit((struct commit
*) merges
.objects
[i
].item
);
1252 object_array_clear(&merges
);
1256 static int merge_mode_and_contents(struct merge_options
*opt
,
1257 const struct diff_filespec
*o
,
1258 const struct diff_filespec
*a
,
1259 const struct diff_filespec
*b
,
1260 const char *filename
,
1261 const char *branch1
,
1262 const char *branch2
,
1263 const int extra_marker_size
,
1264 struct merge_file_info
*result
)
1266 if (opt
->branch1
!= branch1
) {
1268 * It's weird getting a reverse merge with HEAD on the bottom
1269 * side of the conflict markers and the other branch on the
1272 return merge_mode_and_contents(opt
, o
, b
, a
,
1275 extra_marker_size
, result
);
1281 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1283 if (S_ISREG(a
->mode
)) {
1284 result
->blob
.mode
= a
->mode
;
1285 oidcpy(&result
->blob
.oid
, &a
->oid
);
1287 result
->blob
.mode
= b
->mode
;
1288 oidcpy(&result
->blob
.oid
, &b
->oid
);
1291 if (!oid_eq(&a
->oid
, &o
->oid
) && !oid_eq(&b
->oid
, &o
->oid
))
1297 if (a
->mode
== b
->mode
|| a
->mode
== o
->mode
)
1298 result
->blob
.mode
= b
->mode
;
1300 result
->blob
.mode
= a
->mode
;
1301 if (b
->mode
!= o
->mode
) {
1307 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &o
->oid
))
1308 oidcpy(&result
->blob
.oid
, &b
->oid
);
1309 else if (oid_eq(&b
->oid
, &o
->oid
))
1310 oidcpy(&result
->blob
.oid
, &a
->oid
);
1311 else if (S_ISREG(a
->mode
)) {
1312 mmbuffer_t result_buf
;
1313 int ret
= 0, merge_status
;
1315 merge_status
= merge_3way(opt
, &result_buf
, o
, a
, b
,
1319 if ((merge_status
< 0) || !result_buf
.ptr
)
1320 ret
= err(opt
, _("Failed to execute internal merge"));
1323 write_object_file(result_buf
.ptr
, result_buf
.size
,
1324 blob_type
, &result
->blob
.oid
))
1325 ret
= err(opt
, _("Unable to add %s to database"),
1328 free(result_buf
.ptr
);
1331 result
->clean
= (merge_status
== 0);
1332 } else if (S_ISGITLINK(a
->mode
)) {
1333 result
->clean
= merge_submodule(opt
, &result
->blob
.oid
,
1338 } else if (S_ISLNK(a
->mode
)) {
1339 switch (opt
->recursive_variant
) {
1340 case MERGE_RECURSIVE_NORMAL
:
1341 oidcpy(&result
->blob
.oid
, &a
->oid
);
1342 if (!oid_eq(&a
->oid
, &b
->oid
))
1345 case MERGE_RECURSIVE_OURS
:
1346 oidcpy(&result
->blob
.oid
, &a
->oid
);
1348 case MERGE_RECURSIVE_THEIRS
:
1349 oidcpy(&result
->blob
.oid
, &b
->oid
);
1353 BUG("unsupported object type in the tree");
1357 output(opt
, 2, _("Auto-merging %s"), filename
);
1362 static int handle_rename_via_dir(struct merge_options
*opt
,
1363 struct rename_conflict_info
*ci
)
1366 * Handle file adds that need to be renamed due to directory rename
1367 * detection. This differs from handle_rename_normal, because
1368 * there is no content merge to do; just move the file into the
1369 * desired final location.
1371 const struct rename
*ren
= ci
->ren1
;
1372 const struct diff_filespec
*dest
= ren
->pair
->two
;
1374 if (!opt
->call_depth
&& would_lose_untracked(opt
, dest
->path
)) {
1375 char *alt_path
= unique_path(opt
, dest
->path
, ren
->branch
);
1377 output(opt
, 1, _("Error: Refusing to lose untracked file at %s; "
1378 "writing to %s instead."),
1379 dest
->path
, alt_path
);
1381 * Write the file in worktree at alt_path, but not in the
1382 * index. Instead, write to dest->path for the index but
1383 * only at the higher appropriate stage.
1385 if (update_file(opt
, 0, dest
, alt_path
))
1388 return update_stages(opt
, dest
->path
, NULL
,
1389 ren
->branch
== opt
->branch1
? dest
: NULL
,
1390 ren
->branch
== opt
->branch1
? NULL
: dest
);
1393 /* Update dest->path both in index and in worktree */
1394 if (update_file(opt
, 1, dest
, dest
->path
))
1399 static int handle_change_delete(struct merge_options
*opt
,
1400 const char *path
, const char *old_path
,
1401 const struct diff_filespec
*o
,
1402 const struct diff_filespec
*changed
,
1403 const char *change_branch
,
1404 const char *delete_branch
,
1405 const char *change
, const char *change_past
)
1407 char *alt_path
= NULL
;
1408 const char *update_path
= path
;
1411 if (dir_in_way(opt
->repo
->index
, path
, !opt
->call_depth
, 0) ||
1412 (!opt
->call_depth
&& would_lose_untracked(opt
, path
))) {
1413 update_path
= alt_path
= unique_path(opt
, path
, change_branch
);
1416 if (opt
->call_depth
) {
1418 * We cannot arbitrarily accept either a_sha or b_sha as
1419 * correct; since there is no true "middle point" between
1420 * them, simply reuse the base version for virtual merge base.
1422 ret
= remove_file_from_index(opt
->repo
->index
, path
);
1424 ret
= update_file(opt
, 0, o
, update_path
);
1427 * Despite the four nearly duplicate messages and argument
1428 * lists below and the ugliness of the nested if-statements,
1429 * having complete messages makes the job easier for
1432 * The slight variance among the cases is due to the fact
1434 * 1) directory/file conflicts (in effect if
1435 * !alt_path) could cause us to need to write the
1436 * file to a different path.
1437 * 2) renames (in effect if !old_path) could mean that
1438 * there are two names for the path that the user
1439 * may know the file by.
1443 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1444 "and %s in %s. Version %s of %s left in tree."),
1445 change
, path
, delete_branch
, change_past
,
1446 change_branch
, change_branch
, path
);
1448 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1449 "and %s to %s in %s. Version %s of %s left in tree."),
1450 change
, old_path
, delete_branch
, change_past
, path
,
1451 change_branch
, change_branch
, path
);
1455 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1456 "and %s in %s. Version %s of %s left in tree at %s."),
1457 change
, path
, delete_branch
, change_past
,
1458 change_branch
, change_branch
, path
, alt_path
);
1460 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1461 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1462 change
, old_path
, delete_branch
, change_past
, path
,
1463 change_branch
, change_branch
, path
, alt_path
);
1467 * No need to call update_file() on path when change_branch ==
1468 * opt->branch1 && !alt_path, since that would needlessly touch
1469 * path. We could call update_file_flags() with update_cache=0
1470 * and update_wd=0, but that's a no-op.
1472 if (change_branch
!= opt
->branch1
|| alt_path
)
1473 ret
= update_file(opt
, 0, changed
, update_path
);
1480 static int handle_rename_delete(struct merge_options
*opt
,
1481 struct rename_conflict_info
*ci
)
1483 const struct rename
*ren
= ci
->ren1
;
1484 const struct diff_filespec
*orig
= ren
->pair
->one
;
1485 const struct diff_filespec
*dest
= ren
->pair
->two
;
1486 const char *rename_branch
= ren
->branch
;
1487 const char *delete_branch
= (opt
->branch1
== ren
->branch
?
1488 opt
->branch2
: opt
->branch1
);
1490 if (handle_change_delete(opt
,
1491 opt
->call_depth
? orig
->path
: dest
->path
,
1492 opt
->call_depth
? NULL
: orig
->path
,
1494 rename_branch
, delete_branch
,
1495 _("rename"), _("renamed")))
1498 if (opt
->call_depth
)
1499 return remove_file_from_index(opt
->repo
->index
, dest
->path
);
1501 return update_stages(opt
, dest
->path
, NULL
,
1502 rename_branch
== opt
->branch1
? dest
: NULL
,
1503 rename_branch
== opt
->branch1
? NULL
: dest
);
1506 static int handle_file_collision(struct merge_options
*opt
,
1507 const char *collide_path
,
1508 const char *prev_path1
,
1509 const char *prev_path2
,
1510 const char *branch1
, const char *branch2
,
1511 struct diff_filespec
*a
,
1512 struct diff_filespec
*b
)
1514 struct merge_file_info mfi
;
1515 struct diff_filespec null
;
1516 char *alt_path
= NULL
;
1517 const char *update_path
= collide_path
;
1520 * It's easiest to get the correct things into stage 2 and 3, and
1521 * to make sure that the content merge puts HEAD before the other
1522 * branch if we just ensure that branch1 == opt->branch1. So, simply
1523 * flip arguments around if we don't have that.
1525 if (branch1
!= opt
->branch1
) {
1526 return handle_file_collision(opt
, collide_path
,
1527 prev_path2
, prev_path1
,
1533 * In the recursive case, we just opt to undo renames
1535 if (opt
->call_depth
&& (prev_path1
|| prev_path2
)) {
1536 /* Put first file (a->oid, a->mode) in its original spot */
1538 if (update_file(opt
, 1, a
, prev_path1
))
1541 if (update_file(opt
, 1, a
, collide_path
))
1545 /* Put second file (b->oid, b->mode) in its original spot */
1547 if (update_file(opt
, 1, b
, prev_path2
))
1550 if (update_file(opt
, 1, b
, collide_path
))
1554 /* Don't leave something at collision path if unrenaming both */
1555 if (prev_path1
&& prev_path2
)
1556 remove_file(opt
, 1, collide_path
, 0);
1561 /* Remove rename sources if rename/add or rename/rename(2to1) */
1563 remove_file(opt
, 1, prev_path1
,
1564 opt
->call_depth
|| would_lose_untracked(opt
, prev_path1
));
1566 remove_file(opt
, 1, prev_path2
,
1567 opt
->call_depth
|| would_lose_untracked(opt
, prev_path2
));
1570 * Remove the collision path, if it wouldn't cause dirty contents
1571 * or an untracked file to get lost. We'll either overwrite with
1572 * merged contents, or just write out to differently named files.
1574 if (was_dirty(opt
, collide_path
)) {
1575 output(opt
, 1, _("Refusing to lose dirty file at %s"),
1577 update_path
= alt_path
= unique_path(opt
, collide_path
, "merged");
1578 } else if (would_lose_untracked(opt
, collide_path
)) {
1580 * Only way we get here is if both renames were from
1581 * a directory rename AND user had an untracked file
1582 * at the location where both files end up after the
1583 * two directory renames. See testcase 10d of t6043.
1585 output(opt
, 1, _("Refusing to lose untracked file at "
1586 "%s, even though it's in the way."),
1588 update_path
= alt_path
= unique_path(opt
, collide_path
, "merged");
1591 * FIXME: It's possible that the two files are identical
1592 * and that the current working copy happens to match, in
1593 * which case we are unnecessarily touching the working
1594 * tree file. It's not a likely enough scenario that I
1595 * want to code up the checks for it and a better fix is
1596 * available if we restructure how unpack_trees() and
1597 * merge-recursive interoperate anyway, so punting for
1600 remove_file(opt
, 0, collide_path
, 0);
1603 /* Store things in diff_filespecs for functions that need it */
1604 null
.path
= (char *)collide_path
;
1605 oidcpy(&null
.oid
, &null_oid
);
1608 if (merge_mode_and_contents(opt
, &null
, a
, b
, collide_path
,
1609 branch1
, branch2
, opt
->call_depth
* 2, &mfi
))
1611 mfi
.clean
&= !alt_path
;
1612 if (update_file(opt
, mfi
.clean
, &mfi
.blob
, update_path
))
1614 if (!mfi
.clean
&& !opt
->call_depth
&&
1615 update_stages(opt
, collide_path
, NULL
, a
, b
))
1619 * FIXME: If both a & b both started with conflicts (only possible
1620 * if they came from a rename/rename(2to1)), but had IDENTICAL
1621 * contents including those conflicts, then in the next line we claim
1622 * it was clean. If someone cares about this case, we should have the
1623 * caller notify us if we started with conflicts.
1628 static int handle_rename_add(struct merge_options
*opt
,
1629 struct rename_conflict_info
*ci
)
1631 /* a was renamed to c, and a separate c was added. */
1632 struct diff_filespec
*a
= ci
->ren1
->pair
->one
;
1633 struct diff_filespec
*c
= ci
->ren1
->pair
->two
;
1634 char *path
= c
->path
;
1635 char *prev_path_desc
;
1636 struct merge_file_info mfi
;
1638 const char *rename_branch
= ci
->ren1
->branch
;
1639 const char *add_branch
= (opt
->branch1
== rename_branch
?
1640 opt
->branch2
: opt
->branch1
);
1641 int other_stage
= (ci
->ren1
->branch
== opt
->branch1
? 3 : 2);
1643 output(opt
, 1, _("CONFLICT (rename/add): "
1644 "Rename %s->%s in %s. Added %s in %s"),
1645 a
->path
, c
->path
, rename_branch
,
1646 c
->path
, add_branch
);
1648 prev_path_desc
= xstrfmt("version of %s from %s", path
, a
->path
);
1649 if (merge_mode_and_contents(opt
, a
, c
,
1650 &ci
->ren1
->src_entry
->stages
[other_stage
],
1652 opt
->branch1
, opt
->branch2
,
1653 1 + opt
->call_depth
* 2, &mfi
))
1655 free(prev_path_desc
);
1657 ci
->ren1
->dst_entry
->stages
[other_stage
].path
= mfi
.blob
.path
= c
->path
;
1658 return handle_file_collision(opt
,
1659 c
->path
, a
->path
, NULL
,
1660 rename_branch
, add_branch
,
1662 &ci
->ren1
->dst_entry
->stages
[other_stage
]);
1665 static char *find_path_for_conflict(struct merge_options
*opt
,
1667 const char *branch1
,
1668 const char *branch2
)
1670 char *new_path
= NULL
;
1671 if (dir_in_way(opt
->repo
->index
, path
, !opt
->call_depth
, 0)) {
1672 new_path
= unique_path(opt
, path
, branch1
);
1673 output(opt
, 1, _("%s is a directory in %s adding "
1675 path
, branch2
, new_path
);
1676 } else if (would_lose_untracked(opt
, path
)) {
1677 new_path
= unique_path(opt
, path
, branch1
);
1678 output(opt
, 1, _("Refusing to lose untracked file"
1679 " at %s; adding as %s instead"),
1686 static int handle_rename_rename_1to2(struct merge_options
*opt
,
1687 struct rename_conflict_info
*ci
)
1689 /* One file was renamed in both branches, but to different names. */
1690 struct merge_file_info mfi
;
1691 struct diff_filespec
*add
;
1692 struct diff_filespec
*o
= ci
->ren1
->pair
->one
;
1693 struct diff_filespec
*a
= ci
->ren1
->pair
->two
;
1694 struct diff_filespec
*b
= ci
->ren2
->pair
->two
;
1697 output(opt
, 1, _("CONFLICT (rename/rename): "
1698 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1699 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1700 o
->path
, a
->path
, ci
->ren1
->branch
,
1701 o
->path
, b
->path
, ci
->ren2
->branch
,
1702 opt
->call_depth
? _(" (left unresolved)") : "");
1704 path_desc
= xstrfmt("%s and %s, both renamed from %s",
1705 a
->path
, b
->path
, o
->path
);
1706 if (merge_mode_and_contents(opt
, o
, a
, b
, path_desc
,
1707 ci
->ren1
->branch
, ci
->ren2
->branch
,
1708 opt
->call_depth
* 2, &mfi
))
1712 if (opt
->call_depth
) {
1714 * FIXME: For rename/add-source conflicts (if we could detect
1715 * such), this is wrong. We should instead find a unique
1716 * pathname and then either rename the add-source file to that
1717 * unique path, or use that unique path instead of src here.
1719 if (update_file(opt
, 0, &mfi
.blob
, o
->path
))
1723 * Above, we put the merged content at the merge-base's
1724 * path. Now we usually need to delete both a->path and
1725 * b->path. However, the rename on each side of the merge
1726 * could also be involved in a rename/add conflict. In
1727 * such cases, we should keep the added file around,
1728 * resolving the conflict at that path in its favor.
1730 add
= &ci
->ren1
->dst_entry
->stages
[2 ^ 1];
1731 if (is_valid(add
)) {
1732 if (update_file(opt
, 0, add
, a
->path
))
1736 remove_file_from_index(opt
->repo
->index
, a
->path
);
1737 add
= &ci
->ren2
->dst_entry
->stages
[3 ^ 1];
1738 if (is_valid(add
)) {
1739 if (update_file(opt
, 0, add
, b
->path
))
1743 remove_file_from_index(opt
->repo
->index
, b
->path
);
1746 * For each destination path, we need to see if there is a
1747 * rename/add collision. If not, we can write the file out
1748 * to the specified location.
1750 add
= &ci
->ren1
->dst_entry
->stages
[2 ^ 1];
1751 if (is_valid(add
)) {
1752 add
->path
= mfi
.blob
.path
= a
->path
;
1753 if (handle_file_collision(opt
, a
->path
,
1757 &mfi
.blob
, add
) < 0)
1760 char *new_path
= find_path_for_conflict(opt
, a
->path
,
1763 if (update_file(opt
, 0, &mfi
.blob
,
1764 new_path
? new_path
: a
->path
))
1767 if (update_stages(opt
, a
->path
, NULL
, a
, NULL
))
1771 add
= &ci
->ren2
->dst_entry
->stages
[3 ^ 1];
1772 if (is_valid(add
)) {
1773 add
->path
= mfi
.blob
.path
= b
->path
;
1774 if (handle_file_collision(opt
, b
->path
,
1778 add
, &mfi
.blob
) < 0)
1781 char *new_path
= find_path_for_conflict(opt
, b
->path
,
1784 if (update_file(opt
, 0, &mfi
.blob
,
1785 new_path
? new_path
: b
->path
))
1788 if (update_stages(opt
, b
->path
, NULL
, NULL
, b
))
1796 static int handle_rename_rename_2to1(struct merge_options
*opt
,
1797 struct rename_conflict_info
*ci
)
1799 /* Two files, a & b, were renamed to the same thing, c. */
1800 struct diff_filespec
*a
= ci
->ren1
->pair
->one
;
1801 struct diff_filespec
*b
= ci
->ren2
->pair
->one
;
1802 struct diff_filespec
*c1
= ci
->ren1
->pair
->two
;
1803 struct diff_filespec
*c2
= ci
->ren2
->pair
->two
;
1804 char *path
= c1
->path
; /* == c2->path */
1805 char *path_side_1_desc
;
1806 char *path_side_2_desc
;
1807 struct merge_file_info mfi_c1
;
1808 struct merge_file_info mfi_c2
;
1809 int ostage1
, ostage2
;
1811 output(opt
, 1, _("CONFLICT (rename/rename): "
1812 "Rename %s->%s in %s. "
1813 "Rename %s->%s in %s"),
1814 a
->path
, c1
->path
, ci
->ren1
->branch
,
1815 b
->path
, c2
->path
, ci
->ren2
->branch
);
1817 path_side_1_desc
= xstrfmt("version of %s from %s", path
, a
->path
);
1818 path_side_2_desc
= xstrfmt("version of %s from %s", path
, b
->path
);
1819 ostage1
= ci
->ren1
->branch
== opt
->branch1
? 3 : 2;
1820 ostage2
= ostage1
^ 1;
1821 ci
->ren1
->src_entry
->stages
[ostage1
].path
= a
->path
;
1822 ci
->ren2
->src_entry
->stages
[ostage2
].path
= b
->path
;
1823 if (merge_mode_and_contents(opt
, a
, c1
,
1824 &ci
->ren1
->src_entry
->stages
[ostage1
],
1826 opt
->branch1
, opt
->branch2
,
1827 1 + opt
->call_depth
* 2, &mfi_c1
) ||
1828 merge_mode_and_contents(opt
, b
,
1829 &ci
->ren2
->src_entry
->stages
[ostage2
],
1830 c2
, path_side_2_desc
,
1831 opt
->branch1
, opt
->branch2
,
1832 1 + opt
->call_depth
* 2, &mfi_c2
))
1834 free(path_side_1_desc
);
1835 free(path_side_2_desc
);
1836 mfi_c1
.blob
.path
= path
;
1837 mfi_c2
.blob
.path
= path
;
1839 return handle_file_collision(opt
, path
, a
->path
, b
->path
,
1840 ci
->ren1
->branch
, ci
->ren2
->branch
,
1841 &mfi_c1
.blob
, &mfi_c2
.blob
);
1845 * Get the diff_filepairs changed between o_tree and tree.
1847 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*opt
,
1848 struct tree
*o_tree
,
1851 struct diff_queue_struct
*ret
;
1852 struct diff_options opts
;
1854 repo_diff_setup(opt
->repo
, &opts
);
1855 opts
.flags
.recursive
= 1;
1856 opts
.flags
.rename_empty
= 0;
1857 opts
.detect_rename
= merge_detect_rename(opt
);
1859 * We do not have logic to handle the detection of copies. In
1860 * fact, it may not even make sense to add such logic: would we
1861 * really want a change to a base file to be propagated through
1862 * multiple other files by a merge?
1864 if (opts
.detect_rename
> DIFF_DETECT_RENAME
)
1865 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1866 opts
.rename_limit
= opt
->merge_rename_limit
>= 0 ? opt
->merge_rename_limit
:
1867 opt
->diff_rename_limit
>= 0 ? opt
->diff_rename_limit
:
1869 opts
.rename_score
= opt
->rename_score
;
1870 opts
.show_rename_progress
= opt
->show_rename_progress
;
1871 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1872 diff_setup_done(&opts
);
1873 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1874 diffcore_std(&opts
);
1875 if (opts
.needed_rename_limit
> opt
->needed_rename_limit
)
1876 opt
->needed_rename_limit
= opts
.needed_rename_limit
;
1878 ret
= xmalloc(sizeof(*ret
));
1879 *ret
= diff_queued_diff
;
1881 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1882 diff_queued_diff
.nr
= 0;
1883 diff_queued_diff
.queue
= NULL
;
1888 static int tree_has_path(struct tree
*tree
, const char *path
)
1890 struct object_id hashy
;
1891 unsigned short mode_o
;
1893 return !get_tree_entry(&tree
->object
.oid
, path
,
1898 * Return a new string that replaces the beginning portion (which matches
1899 * entry->dir), with entry->new_dir. In perl-speak:
1900 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1902 * Caller must ensure that old_path starts with entry->dir + '/'.
1904 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1905 const char *old_path
)
1907 struct strbuf new_path
= STRBUF_INIT
;
1910 if (entry
->non_unique_new_dir
)
1913 oldlen
= strlen(entry
->dir
);
1914 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1915 strbuf_grow(&new_path
, newlen
);
1916 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1917 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1919 return strbuf_detach(&new_path
, NULL
);
1922 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1923 char **old_dir
, char **new_dir
)
1925 char *end_of_old
, *end_of_new
;
1926 int old_len
, new_len
;
1933 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1934 * the "e/foo.c" part is the same, we just want to know that
1935 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1936 * so, for this example, this function returns "a/b/c/d" in
1937 * *old_dir and "a/b/some/thing/else" in *new_dir.
1939 * Also, if the basename of the file changed, we don't care. We
1940 * want to know which portion of the directory, if any, changed.
1942 end_of_old
= strrchr(old_path
, '/');
1943 end_of_new
= strrchr(new_path
, '/');
1945 if (end_of_old
== NULL
|| end_of_new
== NULL
)
1947 while (*--end_of_new
== *--end_of_old
&&
1948 end_of_old
!= old_path
&&
1949 end_of_new
!= new_path
)
1950 ; /* Do nothing; all in the while loop */
1952 * We've found the first non-matching character in the directory
1953 * paths. That means the current directory we were comparing
1954 * represents the rename. Move end_of_old and end_of_new back
1955 * to the full directory name.
1957 if (*end_of_old
== '/')
1959 if (*end_of_old
!= '/')
1961 end_of_old
= strchr(end_of_old
, '/');
1962 end_of_new
= strchr(end_of_new
, '/');
1965 * It may have been the case that old_path and new_path were the same
1966 * directory all along. Don't claim a rename if they're the same.
1968 old_len
= end_of_old
- old_path
;
1969 new_len
= end_of_new
- new_path
;
1971 if (old_len
!= new_len
|| strncmp(old_path
, new_path
, old_len
)) {
1972 *old_dir
= xstrndup(old_path
, old_len
);
1973 *new_dir
= xstrndup(new_path
, new_len
);
1977 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
1978 struct string_list
*items_to_remove
)
1981 struct dir_rename_entry
*entry
;
1983 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
1984 entry
= items_to_remove
->items
[i
].util
;
1985 hashmap_remove(dir_renames
, entry
, NULL
);
1987 string_list_clear(items_to_remove
, 0);
1991 * See if there is a directory rename for path, and if there are any file
1992 * level conflicts for the renamed location. If there is a rename and
1993 * there are no conflicts, return the new name. Otherwise, return NULL.
1995 static char *handle_path_level_conflicts(struct merge_options
*opt
,
1997 struct dir_rename_entry
*entry
,
1998 struct hashmap
*collisions
,
2001 char *new_path
= NULL
;
2002 struct collision_entry
*collision_ent
;
2004 struct strbuf collision_paths
= STRBUF_INIT
;
2007 * entry has the mapping of old directory name to new directory name
2008 * that we want to apply to path.
2010 new_path
= apply_dir_rename(entry
, path
);
2013 /* This should only happen when entry->non_unique_new_dir set */
2014 if (!entry
->non_unique_new_dir
)
2015 BUG("entry->non_unqiue_dir not set and !new_path");
2016 output(opt
, 1, _("CONFLICT (directory rename split): "
2017 "Unclear where to place %s because directory "
2018 "%s was renamed to multiple other directories, "
2019 "with no destination getting a majority of the "
2027 * The caller needs to have ensured that it has pre-populated
2028 * collisions with all paths that map to new_path. Do a quick check
2029 * to ensure that's the case.
2031 collision_ent
= collision_find_entry(collisions
, new_path
);
2032 if (collision_ent
== NULL
)
2033 BUG("collision_ent is NULL");
2036 * Check for one-sided add/add/.../add conflicts, i.e.
2037 * where implicit renames from the other side doing
2038 * directory rename(s) can affect this side of history
2039 * to put multiple paths into the same location. Warn
2040 * and bail on directory renames for such paths.
2042 if (collision_ent
->reported_already
) {
2044 } else if (tree_has_path(tree
, new_path
)) {
2045 collision_ent
->reported_already
= 1;
2046 strbuf_add_separated_string_list(&collision_paths
, ", ",
2047 &collision_ent
->source_files
);
2048 output(opt
, 1, _("CONFLICT (implicit dir rename): Existing "
2049 "file/dir at %s in the way of implicit "
2050 "directory rename(s) putting the following "
2051 "path(s) there: %s."),
2052 new_path
, collision_paths
.buf
);
2054 } else if (collision_ent
->source_files
.nr
> 1) {
2055 collision_ent
->reported_already
= 1;
2056 strbuf_add_separated_string_list(&collision_paths
, ", ",
2057 &collision_ent
->source_files
);
2058 output(opt
, 1, _("CONFLICT (implicit dir rename): Cannot map "
2059 "more than one path to %s; implicit directory "
2060 "renames tried to put these paths there: %s"),
2061 new_path
, collision_paths
.buf
);
2065 /* Free memory we no longer need */
2066 strbuf_release(&collision_paths
);
2067 if (!clean
&& new_path
) {
2076 * There are a couple things we want to do at the directory level:
2077 * 1. Check for both sides renaming to the same thing, in order to avoid
2078 * implicit renaming of files that should be left in place. (See
2079 * testcase 6b in t6043 for details.)
2080 * 2. Prune directory renames if there are still files left in the
2081 * the original directory. These represent a partial directory rename,
2082 * i.e. a rename where only some of the files within the directory
2083 * were renamed elsewhere. (Technically, this could be done earlier
2084 * in get_directory_renames(), except that would prevent us from
2085 * doing the previous check and thus failing testcase 6b.)
2086 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2087 * In the future, we could potentially record this info as well and
2088 * omit reporting rename/rename(1to2) conflicts for each path within
2089 * the affected directories, thus cleaning up the merge output.
2090 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2091 * directory level, because merging directories is fine. If it
2092 * causes conflicts for files within those merged directories, then
2093 * that should be detected at the individual path level.
2095 static void handle_directory_level_conflicts(struct merge_options
*opt
,
2096 struct hashmap
*dir_re_head
,
2098 struct hashmap
*dir_re_merge
,
2101 struct hashmap_iter iter
;
2102 struct dir_rename_entry
*head_ent
;
2103 struct dir_rename_entry
*merge_ent
;
2105 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
2106 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
2108 hashmap_iter_init(dir_re_head
, &iter
);
2109 while ((head_ent
= hashmap_iter_next(&iter
))) {
2110 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
2112 !head_ent
->non_unique_new_dir
&&
2113 !merge_ent
->non_unique_new_dir
&&
2114 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
2115 /* 1. Renamed identically; remove it from both sides */
2116 string_list_append(&remove_from_head
,
2117 head_ent
->dir
)->util
= head_ent
;
2118 strbuf_release(&head_ent
->new_dir
);
2119 string_list_append(&remove_from_merge
,
2120 merge_ent
->dir
)->util
= merge_ent
;
2121 strbuf_release(&merge_ent
->new_dir
);
2122 } else if (tree_has_path(head
, head_ent
->dir
)) {
2123 /* 2. This wasn't a directory rename after all */
2124 string_list_append(&remove_from_head
,
2125 head_ent
->dir
)->util
= head_ent
;
2126 strbuf_release(&head_ent
->new_dir
);
2130 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2131 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2133 hashmap_iter_init(dir_re_merge
, &iter
);
2134 while ((merge_ent
= hashmap_iter_next(&iter
))) {
2135 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
2136 if (tree_has_path(merge
, merge_ent
->dir
)) {
2137 /* 2. This wasn't a directory rename after all */
2138 string_list_append(&remove_from_merge
,
2139 merge_ent
->dir
)->util
= merge_ent
;
2140 } else if (head_ent
&&
2141 !head_ent
->non_unique_new_dir
&&
2142 !merge_ent
->non_unique_new_dir
) {
2143 /* 3. rename/rename(1to2) */
2145 * We can assume it's not rename/rename(1to1) because
2146 * that was case (1), already checked above. So we
2147 * know that head_ent->new_dir and merge_ent->new_dir
2148 * are different strings.
2150 output(opt
, 1, _("CONFLICT (rename/rename): "
2151 "Rename directory %s->%s in %s. "
2152 "Rename directory %s->%s in %s"),
2153 head_ent
->dir
, head_ent
->new_dir
.buf
, opt
->branch1
,
2154 head_ent
->dir
, merge_ent
->new_dir
.buf
, opt
->branch2
);
2155 string_list_append(&remove_from_head
,
2156 head_ent
->dir
)->util
= head_ent
;
2157 strbuf_release(&head_ent
->new_dir
);
2158 string_list_append(&remove_from_merge
,
2159 merge_ent
->dir
)->util
= merge_ent
;
2160 strbuf_release(&merge_ent
->new_dir
);
2164 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2165 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2168 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
)
2170 struct hashmap
*dir_renames
;
2171 struct hashmap_iter iter
;
2172 struct dir_rename_entry
*entry
;
2176 * Typically, we think of a directory rename as all files from a
2177 * certain directory being moved to a target directory. However,
2178 * what if someone first moved two files from the original
2179 * directory in one commit, and then renamed the directory
2180 * somewhere else in a later commit? At merge time, we just know
2181 * that files from the original directory went to two different
2182 * places, and that the bulk of them ended up in the same place.
2183 * We want each directory rename to represent where the bulk of the
2184 * files from that directory end up; this function exists to find
2185 * where the bulk of the files went.
2187 * The first loop below simply iterates through the list of file
2188 * renames, finding out how often each directory rename pair
2189 * possibility occurs.
2191 dir_renames
= xmalloc(sizeof(*dir_renames
));
2192 dir_rename_init(dir_renames
);
2193 for (i
= 0; i
< pairs
->nr
; ++i
) {
2194 struct string_list_item
*item
;
2196 struct diff_filepair
*pair
= pairs
->queue
[i
];
2197 char *old_dir
, *new_dir
;
2199 /* File not part of directory rename if it wasn't renamed */
2200 if (pair
->status
!= 'R')
2203 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
2204 &old_dir
, &new_dir
);
2206 /* Directory didn't change at all; ignore this one. */
2209 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
2211 entry
= xmalloc(sizeof(*entry
));
2212 dir_rename_entry_init(entry
, old_dir
);
2213 hashmap_put(dir_renames
, entry
);
2217 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
2219 item
= string_list_insert(&entry
->possible_new_dirs
,
2221 item
->util
= xcalloc(1, sizeof(int));
2230 * For each directory with files moved out of it, we find out which
2231 * target directory received the most files so we can declare it to
2232 * be the "winning" target location for the directory rename. This
2233 * winner gets recorded in new_dir. If there is no winner
2234 * (multiple target directories received the same number of files),
2235 * we set non_unique_new_dir. Once we've determined the winner (or
2236 * that there is no winner), we no longer need possible_new_dirs.
2238 hashmap_iter_init(dir_renames
, &iter
);
2239 while ((entry
= hashmap_iter_next(&iter
))) {
2244 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
2245 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
2249 else if (*count
> max
) {
2251 best
= entry
->possible_new_dirs
.items
[i
].string
;
2255 entry
->non_unique_new_dir
= 1;
2257 assert(entry
->new_dir
.len
== 0);
2258 strbuf_addstr(&entry
->new_dir
, best
);
2261 * The relevant directory sub-portion of the original full
2262 * filepaths were xstrndup'ed before inserting into
2263 * possible_new_dirs, and instead of manually iterating the
2264 * list and free'ing each, just lie and tell
2265 * possible_new_dirs that it did the strdup'ing so that it
2266 * will free them for us.
2268 entry
->possible_new_dirs
.strdup_strings
= 1;
2269 string_list_clear(&entry
->possible_new_dirs
, 1);
2275 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
2276 struct hashmap
*dir_renames
)
2278 char *temp
= xstrdup(path
);
2280 struct dir_rename_entry
*entry
= NULL
;
2282 while ((end
= strrchr(temp
, '/'))) {
2284 entry
= dir_rename_find_entry(dir_renames
, temp
);
2292 static void compute_collisions(struct hashmap
*collisions
,
2293 struct hashmap
*dir_renames
,
2294 struct diff_queue_struct
*pairs
)
2299 * Multiple files can be mapped to the same path due to directory
2300 * renames done by the other side of history. Since that other
2301 * side of history could have merged multiple directories into one,
2302 * if our side of history added the same file basename to each of
2303 * those directories, then all N of them would get implicitly
2304 * renamed by the directory rename detection into the same path,
2305 * and we'd get an add/add/.../add conflict, and all those adds
2306 * from *this* side of history. This is not representable in the
2307 * index, and users aren't going to easily be able to make sense of
2308 * it. So we need to provide a good warning about what's
2309 * happening, and fall back to no-directory-rename detection
2310 * behavior for those paths.
2312 * See testcases 9e and all of section 5 from t6043 for examples.
2314 collision_init(collisions
);
2316 for (i
= 0; i
< pairs
->nr
; ++i
) {
2317 struct dir_rename_entry
*dir_rename_ent
;
2318 struct collision_entry
*collision_ent
;
2320 struct diff_filepair
*pair
= pairs
->queue
[i
];
2322 if (pair
->status
!= 'A' && pair
->status
!= 'R')
2324 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
2326 if (!dir_rename_ent
)
2329 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
2332 * dir_rename_ent->non_unique_new_path is true, which
2333 * means there is no directory rename for us to use,
2334 * which means it won't cause us any additional
2338 collision_ent
= collision_find_entry(collisions
, new_path
);
2339 if (!collision_ent
) {
2340 collision_ent
= xcalloc(1,
2341 sizeof(struct collision_entry
));
2342 hashmap_entry_init(collision_ent
, strhash(new_path
));
2343 hashmap_put(collisions
, collision_ent
);
2344 collision_ent
->target_file
= new_path
;
2348 string_list_insert(&collision_ent
->source_files
,
2353 static char *check_for_directory_rename(struct merge_options
*opt
,
2356 struct hashmap
*dir_renames
,
2357 struct hashmap
*dir_rename_exclusions
,
2358 struct hashmap
*collisions
,
2361 char *new_path
= NULL
;
2362 struct dir_rename_entry
*entry
= check_dir_renamed(path
, dir_renames
);
2363 struct dir_rename_entry
*oentry
= NULL
;
2369 * This next part is a little weird. We do not want to do an
2370 * implicit rename into a directory we renamed on our side, because
2371 * that will result in a spurious rename/rename(1to2) conflict. An
2373 * Base commit: dumbdir/afile, otherdir/bfile
2374 * Side 1: smrtdir/afile, otherdir/bfile
2375 * Side 2: dumbdir/afile, dumbdir/bfile
2376 * Here, while working on Side 1, we could notice that otherdir was
2377 * renamed/merged to dumbdir, and change the diff_filepair for
2378 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2379 * 2 will notice the rename from dumbdir to smrtdir, and do the
2380 * transitive rename to move it from dumbdir/bfile to
2381 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2382 * smrtdir, a rename/rename(1to2) conflict. We really just want
2383 * the file to end up in smrtdir. And the way to achieve that is
2384 * to not let Side1 do the rename to dumbdir, since we know that is
2385 * the source of one of our directory renames.
2387 * That's why oentry and dir_rename_exclusions is here.
2389 * As it turns out, this also prevents N-way transient rename
2390 * confusion; See testcases 9c and 9d of t6043.
2392 oentry
= dir_rename_find_entry(dir_rename_exclusions
, entry
->new_dir
.buf
);
2394 output(opt
, 1, _("WARNING: Avoiding applying %s -> %s rename "
2395 "to %s, because %s itself was renamed."),
2396 entry
->dir
, entry
->new_dir
.buf
, path
, entry
->new_dir
.buf
);
2398 new_path
= handle_path_level_conflicts(opt
, path
, entry
,
2400 *clean_merge
&= (new_path
!= NULL
);
2406 static void apply_directory_rename_modifications(struct merge_options
*opt
,
2407 struct diff_filepair
*pair
,
2411 struct tree
*o_tree
,
2412 struct tree
*a_tree
,
2413 struct tree
*b_tree
,
2414 struct string_list
*entries
)
2416 struct string_list_item
*item
;
2417 int stage
= (tree
== a_tree
? 2 : 3);
2421 * In all cases where we can do directory rename detection,
2422 * unpack_trees() will have read pair->two->path into the
2423 * index and the working copy. We need to remove it so that
2424 * we can instead place it at new_path. It is guaranteed to
2425 * not be untracked (unpack_trees() would have errored out
2426 * saying the file would have been overwritten), but it might
2429 update_wd
= !was_dirty(opt
, pair
->two
->path
);
2431 output(opt
, 1, _("Refusing to lose dirty file at %s"),
2433 remove_file(opt
, 1, pair
->two
->path
, !update_wd
);
2435 /* Find or create a new re->dst_entry */
2436 item
= string_list_lookup(entries
, new_path
);
2439 * Since we're renaming on this side of history, and it's
2440 * due to a directory rename on the other side of history
2441 * (which we only allow when the directory in question no
2442 * longer exists on the other side of history), the
2443 * original entry for re->dst_entry is no longer
2446 re
->dst_entry
->processed
= 1;
2449 * ...because we'll be using this new one.
2451 re
->dst_entry
= item
->util
;
2454 * re->dst_entry is for the before-dir-rename path, and we
2455 * need it to hold information for the after-dir-rename
2456 * path. Before creating a new entry, we need to mark the
2457 * old one as unnecessary (...unless it is shared by
2458 * src_entry, i.e. this didn't use to be a rename, in which
2459 * case we can just allow the normal processing to happen
2462 if (pair
->status
== 'R')
2463 re
->dst_entry
->processed
= 1;
2465 re
->dst_entry
= insert_stage_data(new_path
,
2466 o_tree
, a_tree
, b_tree
,
2468 item
= string_list_insert(entries
, new_path
);
2469 item
->util
= re
->dst_entry
;
2473 * Update the stage_data with the information about the path we are
2474 * moving into place. That slot will be empty and available for us
2475 * to write to because of the collision checks in
2476 * handle_path_level_conflicts(). In other words,
2477 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2478 * open for us to write to.
2480 * It may be tempting to actually update the index at this point as
2481 * well, using update_stages_for_stage_data(), but as per the big
2482 * "NOTE" in update_stages(), doing so will modify the current
2483 * in-memory index which will break calls to would_lose_untracked()
2484 * that we need to make. Instead, we need to just make sure that
2485 * the various handle_rename_*() functions update the index
2486 * explicitly rather than relying on unpack_trees() to have done it.
2488 get_tree_entry(&tree
->object
.oid
,
2490 &re
->dst_entry
->stages
[stage
].oid
,
2491 &re
->dst_entry
->stages
[stage
].mode
);
2494 * Record the original change status (or 'type' of change). If it
2495 * was originally an add ('A'), this lets us differentiate later
2496 * between a RENAME_DELETE conflict and RENAME_VIA_DIR (they
2497 * otherwise look the same). If it was originally a rename ('R'),
2498 * this lets us remember and report accurately about the transitive
2499 * renaming that occurred via the directory rename detection. Also,
2500 * record the original destination name.
2502 re
->dir_rename_original_type
= pair
->status
;
2503 re
->dir_rename_original_dest
= pair
->two
->path
;
2506 * We don't actually look at pair->status again, but it seems
2507 * pedagogically correct to adjust it.
2512 * Finally, record the new location.
2514 pair
->two
->path
= new_path
;
2518 * Get information of all renames which occurred in 'pairs', making use of
2519 * any implicit directory renames inferred from the other side of history.
2520 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2521 * to be able to associate the correct cache entries with the rename
2522 * information; tree is always equal to either a_tree or b_tree.
2524 static struct string_list
*get_renames(struct merge_options
*opt
,
2526 struct diff_queue_struct
*pairs
,
2527 struct hashmap
*dir_renames
,
2528 struct hashmap
*dir_rename_exclusions
,
2530 struct tree
*o_tree
,
2531 struct tree
*a_tree
,
2532 struct tree
*b_tree
,
2533 struct string_list
*entries
,
2537 struct hashmap collisions
;
2538 struct hashmap_iter iter
;
2539 struct collision_entry
*e
;
2540 struct string_list
*renames
;
2542 compute_collisions(&collisions
, dir_renames
, pairs
);
2543 renames
= xcalloc(1, sizeof(struct string_list
));
2545 for (i
= 0; i
< pairs
->nr
; ++i
) {
2546 struct string_list_item
*item
;
2548 struct diff_filepair
*pair
= pairs
->queue
[i
];
2549 char *new_path
; /* non-NULL only with directory renames */
2551 if (pair
->status
!= 'A' && pair
->status
!= 'R') {
2552 diff_free_filepair(pair
);
2555 new_path
= check_for_directory_rename(opt
, pair
->two
->path
, tree
,
2557 dir_rename_exclusions
,
2560 if (pair
->status
!= 'R' && !new_path
) {
2561 diff_free_filepair(pair
);
2565 re
= xmalloc(sizeof(*re
));
2568 re
->branch
= branch
;
2569 re
->dir_rename_original_type
= '\0';
2570 re
->dir_rename_original_dest
= NULL
;
2571 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
2573 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
2574 o_tree
, a_tree
, b_tree
, entries
);
2576 re
->src_entry
= item
->util
;
2578 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
2580 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
2581 o_tree
, a_tree
, b_tree
, entries
);
2583 re
->dst_entry
= item
->util
;
2584 item
= string_list_insert(renames
, pair
->one
->path
);
2587 apply_directory_rename_modifications(opt
, pair
, new_path
,
2593 hashmap_iter_init(&collisions
, &iter
);
2594 while ((e
= hashmap_iter_next(&iter
))) {
2595 free(e
->target_file
);
2596 string_list_clear(&e
->source_files
, 0);
2598 hashmap_free(&collisions
, 1);
2602 static int process_renames(struct merge_options
*opt
,
2603 struct string_list
*a_renames
,
2604 struct string_list
*b_renames
)
2606 int clean_merge
= 1, i
, j
;
2607 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
2608 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
2609 const struct rename
*sre
;
2611 for (i
= 0; i
< a_renames
->nr
; i
++) {
2612 sre
= a_renames
->items
[i
].util
;
2613 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
2616 for (i
= 0; i
< b_renames
->nr
; i
++) {
2617 sre
= b_renames
->items
[i
].util
;
2618 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
2622 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
2623 struct string_list
*renames1
, *renames2Dst
;
2624 struct rename
*ren1
= NULL
, *ren2
= NULL
;
2625 const char *ren1_src
, *ren1_dst
;
2626 struct string_list_item
*lookup
;
2628 if (i
>= a_renames
->nr
) {
2629 ren2
= b_renames
->items
[j
++].util
;
2630 } else if (j
>= b_renames
->nr
) {
2631 ren1
= a_renames
->items
[i
++].util
;
2633 int compare
= strcmp(a_renames
->items
[i
].string
,
2634 b_renames
->items
[j
].string
);
2636 ren1
= a_renames
->items
[i
++].util
;
2638 ren2
= b_renames
->items
[j
++].util
;
2641 /* TODO: refactor, so that 1/2 are not needed */
2643 renames1
= a_renames
;
2644 renames2Dst
= &b_by_dst
;
2646 renames1
= b_renames
;
2647 renames2Dst
= &a_by_dst
;
2651 if (ren1
->processed
)
2653 ren1
->processed
= 1;
2654 ren1
->dst_entry
->processed
= 1;
2655 /* BUG: We should only mark src_entry as processed if we
2656 * are not dealing with a rename + add-source case.
2658 ren1
->src_entry
->processed
= 1;
2660 ren1_src
= ren1
->pair
->one
->path
;
2661 ren1_dst
= ren1
->pair
->two
->path
;
2664 /* One file renamed on both sides */
2665 const char *ren2_src
= ren2
->pair
->one
->path
;
2666 const char *ren2_dst
= ren2
->pair
->two
->path
;
2667 enum rename_type rename_type
;
2668 if (strcmp(ren1_src
, ren2_src
) != 0)
2669 BUG("ren1_src != ren2_src");
2670 ren2
->dst_entry
->processed
= 1;
2671 ren2
->processed
= 1;
2672 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
2673 rename_type
= RENAME_ONE_FILE_TO_TWO
;
2676 rename_type
= RENAME_ONE_FILE_TO_ONE
;
2677 /* BUG: We should only remove ren1_src in
2678 * the base stage (think of rename +
2679 * add-source cases).
2681 remove_file(opt
, 1, ren1_src
, 1);
2682 update_entry(ren1
->dst_entry
,
2687 setup_rename_conflict_info(rename_type
, opt
, ren1
, ren2
);
2688 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
2689 /* Two different files renamed to the same thing */
2691 ren2
= lookup
->util
;
2692 ren2_dst
= ren2
->pair
->two
->path
;
2693 if (strcmp(ren1_dst
, ren2_dst
) != 0)
2694 BUG("ren1_dst != ren2_dst");
2697 ren2
->processed
= 1;
2699 * BUG: We should only mark src_entry as processed
2700 * if we are not dealing with a rename + add-source
2703 ren2
->src_entry
->processed
= 1;
2705 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
2708 /* Renamed in 1, maybe changed in 2 */
2709 /* we only use sha1 and mode of these */
2710 struct diff_filespec src_other
, dst_other
;
2714 * unpack_trees loads entries from common-commit
2715 * into stage 1, from head-commit into stage 2, and
2716 * from merge-commit into stage 3. We keep track
2717 * of which side corresponds to the rename.
2719 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2720 int other_stage
= a_renames
== renames1
? 3 : 2;
2722 /* BUG: We should only remove ren1_src in the base
2723 * stage and in other_stage (think of rename +
2726 remove_file(opt
, 1, ren1_src
,
2727 renamed_stage
== 2 || !was_tracked(opt
, ren1_src
));
2729 oidcpy(&src_other
.oid
,
2730 &ren1
->src_entry
->stages
[other_stage
].oid
);
2731 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2732 oidcpy(&dst_other
.oid
,
2733 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2734 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2737 if (oid_eq(&src_other
.oid
, &null_oid
) &&
2738 ren1
->dir_rename_original_type
== 'A') {
2739 setup_rename_conflict_info(RENAME_VIA_DIR
,
2741 } else if (oid_eq(&src_other
.oid
, &null_oid
)) {
2742 setup_rename_conflict_info(RENAME_DELETE
,
2744 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2745 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2747 * Added file on the other side identical to
2748 * the file being renamed: clean merge.
2749 * Also, there is no need to overwrite the
2750 * file already in the working copy, so call
2751 * update_file_flags() instead of
2754 if (update_file_flags(opt
,
2757 1, /* update_cache */
2760 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
2762 * Probably not a clean merge, but it's
2763 * premature to set clean_merge to 0 here,
2764 * because if the rename merges cleanly and
2765 * the merge exactly matches the newly added
2766 * file, then the merge will be clean.
2768 setup_rename_conflict_info(RENAME_ADD
,
2773 if (clean_merge
< 0)
2774 goto cleanup_and_return
;
2776 struct diff_filespec
*o
, *a
, *b
;
2777 src_other
.path
= (char *)ren1_src
;
2779 o
= ren1
->pair
->one
;
2780 if (a_renames
== renames1
) {
2781 a
= ren1
->pair
->two
;
2784 b
= ren1
->pair
->two
;
2787 update_entry(ren1
->dst_entry
, o
, a
, b
);
2788 setup_rename_conflict_info(RENAME_NORMAL
,
2794 string_list_clear(&a_by_dst
, 0);
2795 string_list_clear(&b_by_dst
, 0);
2800 struct rename_info
{
2801 struct string_list
*head_renames
;
2802 struct string_list
*merge_renames
;
2805 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2806 struct hashmap
*dir_renames
)
2808 struct hashmap_iter iter
;
2809 struct dir_rename_entry
*e
;
2811 hashmap_iter_init(dir_renames
, &iter
);
2812 while ((e
= hashmap_iter_next(&iter
))) {
2814 strbuf_release(&e
->new_dir
);
2815 /* possible_new_dirs already cleared in get_directory_renames */
2817 hashmap_free(dir_renames
, 1);
2824 static int detect_and_process_renames(struct merge_options
*opt
,
2825 struct tree
*common
,
2828 struct string_list
*entries
,
2829 struct rename_info
*ri
)
2831 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2832 struct hashmap
*dir_re_head
, *dir_re_merge
;
2835 ri
->head_renames
= NULL
;
2836 ri
->merge_renames
= NULL
;
2838 if (!merge_detect_rename(opt
))
2841 head_pairs
= get_diffpairs(opt
, common
, head
);
2842 merge_pairs
= get_diffpairs(opt
, common
, merge
);
2844 if (opt
->detect_directory_renames
) {
2845 dir_re_head
= get_directory_renames(head_pairs
);
2846 dir_re_merge
= get_directory_renames(merge_pairs
);
2848 handle_directory_level_conflicts(opt
,
2850 dir_re_merge
, merge
);
2852 dir_re_head
= xmalloc(sizeof(*dir_re_head
));
2853 dir_re_merge
= xmalloc(sizeof(*dir_re_merge
));
2854 dir_rename_init(dir_re_head
);
2855 dir_rename_init(dir_re_merge
);
2858 ri
->head_renames
= get_renames(opt
, opt
->branch1
, head_pairs
,
2859 dir_re_merge
, dir_re_head
, head
,
2860 common
, head
, merge
, entries
,
2864 ri
->merge_renames
= get_renames(opt
, opt
->branch2
, merge_pairs
,
2865 dir_re_head
, dir_re_merge
, merge
,
2866 common
, head
, merge
, entries
,
2870 clean
&= process_renames(opt
, ri
->head_renames
, ri
->merge_renames
);
2874 * Some cleanup is deferred until cleanup_renames() because the
2875 * data structures are still needed and referenced in
2876 * process_entry(). But there are a few things we can free now.
2878 initial_cleanup_rename(head_pairs
, dir_re_head
);
2879 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2884 static void final_cleanup_rename(struct string_list
*rename
)
2886 const struct rename
*re
;
2892 for (i
= 0; i
< rename
->nr
; i
++) {
2893 re
= rename
->items
[i
].util
;
2894 diff_free_filepair(re
->pair
);
2896 string_list_clear(rename
, 1);
2900 static void final_cleanup_renames(struct rename_info
*re_info
)
2902 final_cleanup_rename(re_info
->head_renames
);
2903 final_cleanup_rename(re_info
->merge_renames
);
2906 static int read_oid_strbuf(struct merge_options
*opt
,
2907 const struct object_id
*oid
,
2911 enum object_type type
;
2913 buf
= read_object_file(oid
, &type
, &size
);
2915 return err(opt
, _("cannot read object %s"), oid_to_hex(oid
));
2916 if (type
!= OBJ_BLOB
) {
2918 return err(opt
, _("object %s is not a blob"), oid_to_hex(oid
));
2920 strbuf_attach(dst
, buf
, size
, size
+ 1);
2924 static int blob_unchanged(struct merge_options
*opt
,
2925 const struct diff_filespec
*o
,
2926 const struct diff_filespec
*a
,
2927 int renormalize
, const char *path
)
2929 struct strbuf obuf
= STRBUF_INIT
;
2930 struct strbuf abuf
= STRBUF_INIT
;
2931 int ret
= 0; /* assume changed for safety */
2932 const struct index_state
*idx
= opt
->repo
->index
;
2934 if (a
->mode
!= o
->mode
)
2936 if (oid_eq(&o
->oid
, &a
->oid
))
2941 if (read_oid_strbuf(opt
, &o
->oid
, &obuf
) ||
2942 read_oid_strbuf(opt
, &a
->oid
, &abuf
))
2945 * Note: binary | is used so that both renormalizations are
2946 * performed. Comparison can be skipped if both files are
2947 * unchanged since their sha1s have already been compared.
2949 if (renormalize_buffer(idx
, path
, obuf
.buf
, obuf
.len
, &obuf
) |
2950 renormalize_buffer(idx
, path
, abuf
.buf
, abuf
.len
, &abuf
))
2951 ret
= (obuf
.len
== abuf
.len
&& !memcmp(obuf
.buf
, abuf
.buf
, obuf
.len
));
2954 strbuf_release(&obuf
);
2955 strbuf_release(&abuf
);
2959 static int handle_modify_delete(struct merge_options
*opt
,
2961 const struct diff_filespec
*o
,
2962 const struct diff_filespec
*a
,
2963 const struct diff_filespec
*b
)
2965 const char *modify_branch
, *delete_branch
;
2966 const struct diff_filespec
*changed
;
2969 modify_branch
= opt
->branch1
;
2970 delete_branch
= opt
->branch2
;
2973 modify_branch
= opt
->branch2
;
2974 delete_branch
= opt
->branch1
;
2978 return handle_change_delete(opt
,
2981 modify_branch
, delete_branch
,
2982 _("modify"), _("modified"));
2985 static int handle_content_merge(struct merge_options
*opt
,
2988 const struct diff_filespec
*o
,
2989 const struct diff_filespec
*a
,
2990 const struct diff_filespec
*b
,
2991 struct rename_conflict_info
*ci
)
2993 const char *reason
= _("content");
2994 struct merge_file_info mfi
;
2995 unsigned df_conflict_remains
= 0;
2998 reason
= _("add/add");
3000 assert(o
->path
&& a
->path
&& b
->path
);
3001 if (ci
&& dir_in_way(opt
->repo
->index
, path
, !opt
->call_depth
,
3002 S_ISGITLINK(ci
->ren1
->pair
->two
->mode
)))
3003 df_conflict_remains
= 1;
3005 if (merge_mode_and_contents(opt
, o
, a
, b
, path
,
3006 opt
->branch1
, opt
->branch2
,
3007 opt
->call_depth
* 2, &mfi
))
3011 * We can skip updating the working tree file iff:
3012 * a) The merge is clean
3013 * b) The merge matches what was in HEAD (content, mode, pathname)
3014 * c) The target path is usable (i.e. not involved in D/F conflict)
3016 if (mfi
.clean
&& was_tracked_and_matches(opt
, path
, &mfi
.blob
) &&
3017 !df_conflict_remains
) {
3019 struct cache_entry
*ce
;
3021 output(opt
, 3, _("Skipped %s (merged same as existing)"), path
);
3022 if (add_cacheinfo(opt
, &mfi
.blob
, path
,
3023 0, (!opt
->call_depth
&& !is_dirty
), 0))
3026 * However, add_cacheinfo() will delete the old cache entry
3027 * and add a new one. We need to copy over any skip_worktree
3028 * flag to avoid making the file appear as if it were
3029 * deleted by the user.
3031 pos
= index_name_pos(&opt
->orig_index
, path
, strlen(path
));
3032 ce
= opt
->orig_index
.cache
[pos
];
3033 if (ce_skip_worktree(ce
)) {
3034 pos
= index_name_pos(opt
->repo
->index
, path
, strlen(path
));
3035 ce
= opt
->repo
->index
->cache
[pos
];
3036 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
3042 if (S_ISGITLINK(mfi
.blob
.mode
))
3043 reason
= _("submodule");
3044 output(opt
, 1, _("CONFLICT (%s): Merge conflict in %s"),
3046 if (ci
&& !df_conflict_remains
)
3047 if (update_stages(opt
, path
, o
, a
, b
))
3051 if (df_conflict_remains
|| is_dirty
) {
3053 if (opt
->call_depth
) {
3054 remove_file_from_index(opt
->repo
->index
, path
);
3057 if (update_stages(opt
, path
, o
, a
, b
))
3060 int file_from_stage2
= was_tracked(opt
, path
);
3062 if (update_stages(opt
, path
, NULL
,
3063 file_from_stage2
? &mfi
.blob
: NULL
,
3064 file_from_stage2
? NULL
: &mfi
.blob
))
3069 new_path
= unique_path(opt
, path
, ci
->ren1
->branch
);
3071 output(opt
, 1, _("Refusing to lose dirty file at %s"),
3074 output(opt
, 1, _("Adding as %s instead"), new_path
);
3075 if (update_file(opt
, 0, &mfi
.blob
, new_path
)) {
3081 } else if (update_file(opt
, mfi
.clean
, &mfi
.blob
, path
))
3083 return !is_dirty
&& mfi
.clean
;
3086 static int handle_rename_normal(struct merge_options
*opt
,
3088 const struct diff_filespec
*o
,
3089 const struct diff_filespec
*a
,
3090 const struct diff_filespec
*b
,
3091 struct rename_conflict_info
*ci
)
3093 /* Merge the content and write it out */
3094 return handle_content_merge(opt
, path
, was_dirty(opt
, path
),
3098 /* Per entry merge function */
3099 static int process_entry(struct merge_options
*opt
,
3100 const char *path
, struct stage_data
*entry
)
3102 int clean_merge
= 1;
3103 int normalize
= opt
->renormalize
;
3105 struct diff_filespec
*o
= &entry
->stages
[1];
3106 struct diff_filespec
*a
= &entry
->stages
[2];
3107 struct diff_filespec
*b
= &entry
->stages
[3];
3108 int o_valid
= is_valid(o
);
3109 int a_valid
= is_valid(a
);
3110 int b_valid
= is_valid(b
);
3111 o
->path
= a
->path
= b
->path
= (char*)path
;
3113 entry
->processed
= 1;
3114 if (entry
->rename_conflict_info
) {
3115 struct rename_conflict_info
*ci
= entry
->rename_conflict_info
;
3116 struct diff_filespec
*temp
;
3119 * For cases with a single rename, {o,a,b}->path have all been
3120 * set to the rename target path; we need to set two of these
3121 * back to the rename source.
3122 * For rename/rename conflicts, we'll manually fix paths below.
3124 temp
= (opt
->branch1
== ci
->ren1
->branch
) ? b
: a
;
3125 o
->path
= temp
->path
= ci
->ren1
->pair
->one
->path
;
3127 assert(opt
->branch1
== ci
->ren1
->branch
);
3130 switch (ci
->rename_type
) {
3132 case RENAME_ONE_FILE_TO_ONE
:
3133 clean_merge
= handle_rename_normal(opt
, path
, o
, a
, b
,
3136 case RENAME_VIA_DIR
:
3138 if (handle_rename_via_dir(opt
, ci
))
3143 * Probably unclean merge, but if the renamed file
3144 * merges cleanly and the result can then be
3145 * two-way merged cleanly with the added file, I
3146 * guess it's a clean merge?
3148 clean_merge
= handle_rename_add(opt
, ci
);
3152 if (handle_rename_delete(opt
, ci
))
3155 case RENAME_ONE_FILE_TO_TWO
:
3157 * Manually fix up paths; note:
3158 * ren[12]->pair->one->path are equal.
3160 o
->path
= ci
->ren1
->pair
->one
->path
;
3161 a
->path
= ci
->ren1
->pair
->two
->path
;
3162 b
->path
= ci
->ren2
->pair
->two
->path
;
3165 if (handle_rename_rename_1to2(opt
, ci
))
3168 case RENAME_TWO_FILES_TO_ONE
:
3170 * Manually fix up paths; note,
3171 * ren[12]->pair->two->path are actually equal.
3174 a
->path
= ci
->ren1
->pair
->two
->path
;
3175 b
->path
= ci
->ren2
->pair
->two
->path
;
3178 * Probably unclean merge, but if the two renamed
3179 * files merge cleanly and the two resulting files
3180 * can then be two-way merged cleanly, I guess it's
3183 clean_merge
= handle_rename_rename_2to1(opt
, ci
);
3186 entry
->processed
= 0;
3189 } else if (o_valid
&& (!a_valid
|| !b_valid
)) {
3190 /* Case A: Deleted in one */
3191 if ((!a_valid
&& !b_valid
) ||
3192 (!b_valid
&& blob_unchanged(opt
, o
, a
, normalize
, path
)) ||
3193 (!a_valid
&& blob_unchanged(opt
, o
, b
, normalize
, path
))) {
3194 /* Deleted in both or deleted in one and
3195 * unchanged in the other */
3197 output(opt
, 2, _("Removing %s"), path
);
3198 /* do not touch working file if it did not exist */
3199 remove_file(opt
, 1, path
, !a_valid
);
3201 /* Modify/delete; deleted side may have put a directory in the way */
3203 if (handle_modify_delete(opt
, path
, o
, a
, b
))
3206 } else if ((!o_valid
&& a_valid
&& !b_valid
) ||
3207 (!o_valid
&& !a_valid
&& b_valid
)) {
3208 /* Case B: Added in one. */
3209 /* [nothing|directory] -> ([nothing|directory], file) */
3211 const char *add_branch
;
3212 const char *other_branch
;
3214 const struct diff_filespec
*contents
;
3217 add_branch
= opt
->branch1
;
3218 other_branch
= opt
->branch2
;
3220 conf
= _("file/directory");
3222 add_branch
= opt
->branch2
;
3223 other_branch
= opt
->branch1
;
3225 conf
= _("directory/file");
3227 if (dir_in_way(opt
->repo
->index
, path
,
3228 !opt
->call_depth
&& !S_ISGITLINK(a
->mode
),
3230 char *new_path
= unique_path(opt
, path
, add_branch
);
3232 output(opt
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3234 conf
, path
, other_branch
, path
, new_path
);
3235 if (update_file(opt
, 0, contents
, new_path
))
3237 else if (opt
->call_depth
)
3238 remove_file_from_index(opt
->repo
->index
, path
);
3241 output(opt
, 2, _("Adding %s"), path
);
3242 /* do not overwrite file if already present */
3243 if (update_file_flags(opt
, contents
, path
, 1, !a_valid
))
3246 } else if (a_valid
&& b_valid
) {
3248 /* Case C: Added in both (check for same permissions) */
3250 _("CONFLICT (add/add): Merge conflict in %s"),
3252 clean_merge
= handle_file_collision(opt
,
3258 /* case D: Modified in both, but differently. */
3259 int is_dirty
= 0; /* unpack_trees would have bailed if dirty */
3260 clean_merge
= handle_content_merge(opt
, path
, is_dirty
,
3263 } else if (!o_valid
&& !a_valid
&& !b_valid
) {
3265 * this entry was deleted altogether. a_mode == 0 means
3266 * we had that path and want to actively remove it.
3268 remove_file(opt
, 1, path
, !a
->mode
);
3270 BUG("fatal merge failure, shouldn't happen.");
3275 int merge_trees(struct merge_options
*opt
,
3278 struct tree
*common
,
3279 struct tree
**result
)
3281 struct index_state
*istate
= opt
->repo
->index
;
3283 struct strbuf sb
= STRBUF_INIT
;
3285 if (!opt
->call_depth
&& repo_index_has_changes(opt
->repo
, head
, &sb
)) {
3286 err(opt
, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3291 if (opt
->subtree_shift
) {
3292 merge
= shift_tree_object(opt
->repo
, head
, merge
, opt
->subtree_shift
);
3293 common
= shift_tree_object(opt
->repo
, head
, common
, opt
->subtree_shift
);
3296 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
3297 output(opt
, 0, _("Already up to date!"));
3302 code
= unpack_trees_start(opt
, common
, head
, merge
);
3305 if (show(opt
, 4) || opt
->call_depth
)
3306 err(opt
, _("merging of trees %s and %s failed"),
3307 oid_to_hex(&head
->object
.oid
),
3308 oid_to_hex(&merge
->object
.oid
));
3309 unpack_trees_finish(opt
);
3313 if (unmerged_index(istate
)) {
3314 struct string_list
*entries
;
3315 struct rename_info re_info
;
3318 * Only need the hashmap while processing entries, so
3319 * initialize it here and free it when we are done running
3320 * through the entries. Keeping it in the merge_options as
3321 * opposed to decaring a local hashmap is for convenience
3322 * so that we don't have to pass it to around.
3324 hashmap_init(&opt
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
3325 get_files_dirs(opt
, head
);
3326 get_files_dirs(opt
, merge
);
3328 entries
= get_unmerged(opt
->repo
->index
);
3329 clean
= detect_and_process_renames(opt
, common
, head
, merge
,
3331 record_df_conflict_files(opt
, entries
);
3334 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
3335 const char *path
= entries
->items
[i
].string
;
3336 struct stage_data
*e
= entries
->items
[i
].util
;
3337 if (!e
->processed
) {
3338 int ret
= process_entry(opt
, path
, e
);
3347 for (i
= 0; i
< entries
->nr
; i
++) {
3348 struct stage_data
*e
= entries
->items
[i
].util
;
3350 BUG("unprocessed path??? %s",
3351 entries
->items
[i
].string
);
3355 final_cleanup_renames(&re_info
);
3357 string_list_clear(entries
, 1);
3360 hashmap_free(&opt
->current_file_dir_set
, 1);
3363 unpack_trees_finish(opt
);
3370 unpack_trees_finish(opt
);
3372 if (opt
->call_depth
&& !(*result
= write_tree_from_memory(opt
)))
3378 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
3380 struct commit_list
*next
= NULL
, *current
, *backup
;
3381 for (current
= list
; current
; current
= backup
) {
3382 backup
= current
->next
;
3383 current
->next
= next
;
3390 * Merge the commits h1 and h2, return the resulting virtual
3391 * commit object and a flag indicating the cleanness of the merge.
3393 int merge_recursive(struct merge_options
*opt
,
3396 struct commit_list
*ca
,
3397 struct commit
**result
)
3399 struct commit_list
*iter
;
3400 struct commit
*merged_common_ancestors
;
3401 struct tree
*mrtree
;
3405 output(opt
, 4, _("Merging:"));
3406 output_commit_title(opt
, h1
);
3407 output_commit_title(opt
, h2
);
3411 ca
= get_merge_bases(h1
, h2
);
3412 ca
= reverse_commit_list(ca
);
3416 unsigned cnt
= commit_list_count(ca
);
3418 output(opt
, 5, Q_("found %u common ancestor:",
3419 "found %u common ancestors:", cnt
), cnt
);
3420 for (iter
= ca
; iter
; iter
= iter
->next
)
3421 output_commit_title(opt
, iter
->item
);
3424 merged_common_ancestors
= pop_commit(&ca
);
3425 if (merged_common_ancestors
== NULL
) {
3426 /* if there is no common ancestor, use an empty tree */
3429 tree
= lookup_tree(opt
->repo
, opt
->repo
->hash_algo
->empty_tree
);
3430 merged_common_ancestors
= make_virtual_commit(opt
->repo
, tree
, "ancestor");
3433 for (iter
= ca
; iter
; iter
= iter
->next
) {
3434 const char *saved_b1
, *saved_b2
;
3437 * When the merge fails, the result contains files
3438 * with conflict markers. The cleanness flag is
3439 * ignored (unless indicating an error), it was never
3440 * actually used, as result of merge_trees has always
3441 * overwritten it: the committed "conflicts" were
3444 discard_index(opt
->repo
->index
);
3445 saved_b1
= opt
->branch1
;
3446 saved_b2
= opt
->branch2
;
3447 opt
->branch1
= "Temporary merge branch 1";
3448 opt
->branch2
= "Temporary merge branch 2";
3449 if (merge_recursive(opt
, merged_common_ancestors
, iter
->item
,
3450 NULL
, &merged_common_ancestors
) < 0)
3452 opt
->branch1
= saved_b1
;
3453 opt
->branch2
= saved_b2
;
3456 if (!merged_common_ancestors
)
3457 return err(opt
, _("merge returned no commit"));
3460 discard_index(opt
->repo
->index
);
3461 if (!opt
->call_depth
)
3462 repo_read_index(opt
->repo
);
3464 opt
->ancestor
= "merged common ancestors";
3465 clean
= merge_trees(opt
, get_commit_tree(h1
), get_commit_tree(h2
),
3466 get_commit_tree(merged_common_ancestors
),
3473 if (opt
->call_depth
) {
3474 *result
= make_virtual_commit(opt
->repo
, mrtree
, "merged tree");
3475 commit_list_insert(h1
, &(*result
)->parents
);
3476 commit_list_insert(h2
, &(*result
)->parents
->next
);
3479 if (!opt
->call_depth
&& opt
->buffer_output
< 2)
3480 strbuf_release(&opt
->obuf
);
3482 diff_warn_rename_limit("merge.renamelimit",
3483 opt
->needed_rename_limit
, 0);
3487 static struct commit
*get_ref(struct repository
*repo
, const struct object_id
*oid
,
3490 struct object
*object
;
3492 object
= deref_tag(repo
, parse_object(repo
, oid
),
3493 name
, strlen(name
));
3496 if (object
->type
== OBJ_TREE
)
3497 return make_virtual_commit(repo
, (struct tree
*)object
, name
);
3498 if (object
->type
!= OBJ_COMMIT
)
3500 if (parse_commit((struct commit
*)object
))
3502 return (struct commit
*)object
;
3505 int merge_recursive_generic(struct merge_options
*opt
,
3506 const struct object_id
*head
,
3507 const struct object_id
*merge
,
3509 const struct object_id
**base_list
,
3510 struct commit
**result
)
3513 struct lock_file lock
= LOCK_INIT
;
3514 struct commit
*head_commit
= get_ref(opt
->repo
, head
, opt
->branch1
);
3515 struct commit
*next_commit
= get_ref(opt
->repo
, merge
, opt
->branch2
);
3516 struct commit_list
*ca
= NULL
;
3520 for (i
= 0; i
< num_base_list
; ++i
) {
3521 struct commit
*base
;
3522 if (!(base
= get_ref(opt
->repo
, base_list
[i
], oid_to_hex(base_list
[i
]))))
3523 return err(opt
, _("Could not parse object '%s'"),
3524 oid_to_hex(base_list
[i
]));
3525 commit_list_insert(base
, &ca
);
3529 repo_hold_locked_index(opt
->repo
, &lock
, LOCK_DIE_ON_ERROR
);
3530 clean
= merge_recursive(opt
, head_commit
, next_commit
, ca
,
3533 rollback_lock_file(&lock
);
3537 if (write_locked_index(opt
->repo
->index
, &lock
,
3538 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
3539 return err(opt
, _("Unable to write index."));
3541 return clean
? 0 : 1;
3544 static void merge_recursive_config(struct merge_options
*opt
)
3547 git_config_get_int("merge.verbosity", &opt
->verbosity
);
3548 git_config_get_int("diff.renamelimit", &opt
->diff_rename_limit
);
3549 git_config_get_int("merge.renamelimit", &opt
->merge_rename_limit
);
3550 if (!git_config_get_string("diff.renames", &value
)) {
3551 opt
->diff_detect_rename
= git_config_rename("diff.renames", value
);
3554 if (!git_config_get_string("merge.renames", &value
)) {
3555 opt
->merge_detect_rename
= git_config_rename("merge.renames", value
);
3558 git_config(git_xmerge_config
, NULL
);
3561 void init_merge_options(struct merge_options
*opt
,
3562 struct repository
*repo
)
3564 const char *merge_verbosity
;
3565 memset(opt
, 0, sizeof(struct merge_options
));
3568 opt
->buffer_output
= 1;
3569 opt
->diff_rename_limit
= -1;
3570 opt
->merge_rename_limit
= -1;
3571 opt
->renormalize
= 0;
3572 opt
->diff_detect_rename
= -1;
3573 opt
->merge_detect_rename
= -1;
3574 opt
->detect_directory_renames
= 1;
3575 merge_recursive_config(opt
);
3576 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
3577 if (merge_verbosity
)
3578 opt
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
3579 if (opt
->verbosity
>= 5)
3580 opt
->buffer_output
= 0;
3581 strbuf_init(&opt
->obuf
, 0);
3582 string_list_init(&opt
->df_conflict_file_set
, 1);
3585 int parse_merge_opt(struct merge_options
*opt
, const char *s
)
3591 if (!strcmp(s
, "ours"))
3592 opt
->recursive_variant
= MERGE_RECURSIVE_OURS
;
3593 else if (!strcmp(s
, "theirs"))
3594 opt
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
3595 else if (!strcmp(s
, "subtree"))
3596 opt
->subtree_shift
= "";
3597 else if (skip_prefix(s
, "subtree=", &arg
))
3598 opt
->subtree_shift
= arg
;
3599 else if (!strcmp(s
, "patience"))
3600 opt
->xdl_opts
= DIFF_WITH_ALG(opt
, PATIENCE_DIFF
);
3601 else if (!strcmp(s
, "histogram"))
3602 opt
->xdl_opts
= DIFF_WITH_ALG(opt
, HISTOGRAM_DIFF
);
3603 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
3604 long value
= parse_algorithm_value(arg
);
3607 /* clear out previous settings */
3608 DIFF_XDL_CLR(opt
, NEED_MINIMAL
);
3609 opt
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3610 opt
->xdl_opts
|= value
;
3612 else if (!strcmp(s
, "ignore-space-change"))
3613 DIFF_XDL_SET(opt
, IGNORE_WHITESPACE_CHANGE
);
3614 else if (!strcmp(s
, "ignore-all-space"))
3615 DIFF_XDL_SET(opt
, IGNORE_WHITESPACE
);
3616 else if (!strcmp(s
, "ignore-space-at-eol"))
3617 DIFF_XDL_SET(opt
, IGNORE_WHITESPACE_AT_EOL
);
3618 else if (!strcmp(s
, "ignore-cr-at-eol"))
3619 DIFF_XDL_SET(opt
, IGNORE_CR_AT_EOL
);
3620 else if (!strcmp(s
, "renormalize"))
3621 opt
->renormalize
= 1;
3622 else if (!strcmp(s
, "no-renormalize"))
3623 opt
->renormalize
= 0;
3624 else if (!strcmp(s
, "no-renames"))
3625 opt
->merge_detect_rename
= 0;
3626 else if (!strcmp(s
, "find-renames")) {
3627 opt
->merge_detect_rename
= 1;
3628 opt
->rename_score
= 0;
3630 else if (skip_prefix(s
, "find-renames=", &arg
) ||
3631 skip_prefix(s
, "rename-threshold=", &arg
)) {
3632 if ((opt
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
3634 opt
->merge_detect_rename
= 1;
3637 * Please update $__git_merge_strategy_options in
3638 * git-completion.bash when you add new options