2 * "Ostensibly Recursive's Twin" merge strategy, or "ort" for short. Meant
3 * as a drop-in replacement for the "recursive" merge strategy, allowing one
6 * git merge [-s recursive]
12 * Note: git's parser allows the space between '-s' and its argument to be
13 * missing. (Should I have backronymed "ham", "alsa", "kip", "nap, "alvo",
14 * "cale", "peedy", or "ins" instead of "ort"?)
18 #include "merge-ort.h"
23 #include "cache-tree.h"
25 #include "commit-reach.h"
31 #include "object-store.h"
32 #include "promisor-remote.h"
35 #include "submodule.h"
37 #include "unpack-trees.h"
38 #include "xdiff-interface.h"
41 * We have many arrays of size 3. Whenever we have such an array, the
42 * indices refer to one of the sides of the three-way merge. This is so
43 * pervasive that the constants 0, 1, and 2 are used in many places in the
44 * code (especially in arithmetic operations to find the other side's index
45 * or to compute a relevant mask), but sometimes these enum names are used
46 * to aid code clarity.
48 * See also 'filemask' and 'dirmask' in struct conflict_info; the "ith side"
49 * referred to there is one of these three sides.
57 static unsigned RESULT_INITIALIZED
= 0x1abe11ed; /* unlikely accidental value */
59 struct traversal_callback_data
{
61 unsigned long dirmask
;
62 struct name_entry names
[3];
67 * All variables that are arrays of size 3 correspond to data tracked
68 * for the sides in enum merge_side. Index 0 is almost always unused
69 * because we often only need to track information for MERGE_SIDE1 and
70 * MERGE_SIDE2 (MERGE_BASE can't have rename information since renames
71 * are determined relative to what changed since the MERGE_BASE).
75 * pairs: pairing of filenames from diffcore_rename()
77 struct diff_queue_struct pairs
[3];
80 * dirs_removed: directories removed on a given side of history.
82 * The keys of dirs_removed[side] are the directories that were removed
83 * on the given side of history. The value of the strintmap for each
84 * directory is a value from enum dir_rename_relevance.
86 struct strintmap dirs_removed
[3];
89 * dir_rename_count: tracking where parts of a directory were renamed to
91 * When files in a directory are renamed, they may not all go to the
92 * same location. Each strmap here tracks:
93 * old_dir => {new_dir => int}
94 * That is, dir_rename_count[side] is a strmap to a strintmap.
96 struct strmap dir_rename_count
[3];
99 * dir_renames: computed directory renames
101 * This is a map of old_dir => new_dir and is derived in part from
104 struct strmap dir_renames
[3];
107 * relevant_sources: deleted paths wanted in rename detection, and why
109 * relevant_sources is a set of deleted paths on each side of
110 * history for which we need rename detection. If a path is deleted
111 * on one side of history, we need to detect if it is part of a
113 * * the file is modified/deleted on the other side of history
114 * * we need to detect renames for an ancestor directory
115 * If neither of those are true, we can skip rename detection for
116 * that path. The reason is stored as a value from enum
117 * file_rename_relevance, as the reason can inform the algorithm in
118 * diffcore_rename_extended().
120 struct strintmap relevant_sources
[3];
124 * 0: optimization removing unmodified potential rename source okay
125 * 2 or 4: optimization okay, but must check for files added to dir
126 * 7: optimization forbidden; need rename source in case of dir rename
128 unsigned dir_rename_mask
:3;
131 * callback_data_*: supporting data structures for alternate traversal
133 * We sometimes need to be able to traverse through all the files
134 * in a given tree before all immediate subdirectories within that
135 * tree. Since traverse_trees() doesn't do that naturally, we have
136 * a traverse_trees_wrapper() that stores any immediate
137 * subdirectories while traversing files, then traverses the
138 * immediate subdirectories later. These callback_data* variables
139 * store the information for the subdirectories so that we can do
140 * that traversal order.
142 struct traversal_callback_data
*callback_data
;
143 int callback_data_nr
, callback_data_alloc
;
144 char *callback_data_traverse_path
;
147 * merge_trees: trees passed to the merge algorithm for the merge
149 * merge_trees records the trees passed to the merge algorithm. But,
150 * this data also is stored in merge_result->priv. If a sequence of
151 * merges are being done (such as when cherry-picking or rebasing),
152 * the next merge can look at this and re-use information from
153 * previous merges under certain circumstances.
155 * See also all the cached_* variables.
157 struct tree
*merge_trees
[3];
160 * cached_pairs_valid_side: which side's cached info can be reused
162 * See the description for merge_trees. For repeated merges, at most
163 * only one side's cached information can be used. Valid values:
164 * MERGE_SIDE2: cached data from side2 can be reused
165 * MERGE_SIDE1: cached data from side1 can be reused
166 * 0: no cached data can be reused
168 int cached_pairs_valid_side
;
171 * cached_pairs: Caching of renames and deletions.
173 * These are mappings recording renames and deletions of individual
174 * files (not directories). They are thus a map from an old
175 * filename to either NULL (for deletions) or a new filename (for
178 struct strmap cached_pairs
[3];
181 * cached_target_names: just the destinations from cached_pairs
183 * We sometimes want a fast lookup to determine if a given filename
184 * is one of the destinations in cached_pairs. cached_target_names
185 * is thus duplicative information, but it provides a fast lookup.
187 struct strset cached_target_names
[3];
190 * cached_irrelevant: Caching of rename_sources that aren't relevant.
192 * If we try to detect a rename for a source path and succeed, it's
193 * part of a rename. If we try to detect a rename for a source path
194 * and fail, then it's a delete. If we do not try to detect a rename
195 * for a path, then we don't know if it's a rename or a delete. If
196 * merge-ort doesn't think the path is relevant, then we just won't
197 * cache anything for that path. But there's a slight problem in
198 * that merge-ort can think a path is RELEVANT_LOCATION, but due to
199 * commit 9bd342137e ("diffcore-rename: determine which
200 * relevant_sources are no longer relevant", 2021-03-13),
201 * diffcore-rename can downgrade the path to RELEVANT_NO_MORE. To
202 * avoid excessive calls to diffcore_rename_extended() we still need
203 * to cache such paths, though we cannot record them as either
204 * renames or deletes. So we cache them here as a "turned out to be
205 * irrelevant *for this commit*" as they are often also irrelevant
206 * for subsequent commits, though we will have to do some extra
207 * checking to see whether such paths become relevant for rename
208 * detection when cherry-picking/rebasing subsequent commits.
210 struct strset cached_irrelevant
[3];
213 * needed_limit: value needed for inexact rename detection to run
215 * If the current rename limit wasn't high enough for inexact
216 * rename detection to run, this records the limit needed. Otherwise,
217 * this value remains 0.
222 struct merge_options_internal
{
224 * paths: primary data structure in all of merge ort.
227 * * are full relative paths from the toplevel of the repository
228 * (e.g. "drivers/firmware/raspberrypi.c").
229 * * store all relevant paths in the repo, both directories and
230 * files (e.g. drivers, drivers/firmware would also be included)
231 * * these keys serve to intern all the path strings, which allows
232 * us to do pointer comparison on directory names instead of
233 * strcmp; we just have to be careful to use the interned strings.
234 * (Technically paths_to_free may track some strings that were
235 * removed from froms paths.)
237 * The values of paths:
238 * * either a pointer to a merged_info, or a conflict_info struct
239 * * merged_info contains all relevant information for a
240 * non-conflicted entry.
241 * * conflict_info contains a merged_info, plus any additional
242 * information about a conflict such as the higher orders stages
243 * involved and the names of the paths those came from (handy
244 * once renames get involved).
245 * * a path may start "conflicted" (i.e. point to a conflict_info)
246 * and then a later step (e.g. three-way content merge) determines
247 * it can be cleanly merged, at which point it'll be marked clean
248 * and the algorithm will ignore any data outside the contained
249 * merged_info for that entry
250 * * If an entry remains conflicted, the merged_info portion of a
251 * conflict_info will later be filled with whatever version of
252 * the file should be placed in the working directory (e.g. an
253 * as-merged-as-possible variation that contains conflict markers).
258 * conflicted: a subset of keys->values from "paths"
260 * conflicted is basically an optimization between process_entries()
261 * and record_conflicted_index_entries(); the latter could loop over
262 * ALL the entries in paths AGAIN and look for the ones that are
263 * still conflicted, but since process_entries() has to loop over
264 * all of them, it saves the ones it couldn't resolve in this strmap
265 * so that record_conflicted_index_entries() can iterate just the
268 struct strmap conflicted
;
271 * paths_to_free: additional list of strings to free
273 * If keys are removed from "paths", they are added to paths_to_free
274 * to ensure they are later freed. We avoid free'ing immediately since
275 * other places (e.g. conflict_info.pathnames[]) may still be
276 * referencing these paths.
278 struct string_list paths_to_free
;
281 * output: special messages and conflict notices for various paths
283 * This is a map of pathnames (a subset of the keys in "paths" above)
284 * to strbufs. It gathers various warning/conflict/notice messages
285 * for later processing.
287 struct strmap output
;
290 * renames: various data relating to rename detection
292 struct rename_info renames
;
295 * attr_index: hacky minimal index used for renormalization
297 * renormalization code _requires_ an index, though it only needs to
298 * find a .gitattributes file within the index. So, when
299 * renormalization is important, we create a special index with just
302 struct index_state attr_index
;
305 * current_dir_name, toplevel_dir: temporary vars
307 * These are used in collect_merge_info_callback(), and will set the
308 * various merged_info.directory_name for the various paths we get;
309 * see documentation for that variable and the requirements placed on
312 const char *current_dir_name
;
313 const char *toplevel_dir
;
315 /* call_depth: recursion level counter for merging merge bases */
319 struct version_info
{
320 struct object_id oid
;
325 /* if is_null, ignore result. otherwise result has oid & mode */
326 struct version_info result
;
330 * clean: whether the path in question is cleanly merged.
332 * see conflict_info.merged for more details.
337 * basename_offset: offset of basename of path.
339 * perf optimization to avoid recomputing offset of final '/'
340 * character in pathname (0 if no '/' in pathname).
342 size_t basename_offset
;
345 * directory_name: containing directory name.
347 * Note that we assume directory_name is constructed such that
348 * strcmp(dir1_name, dir2_name) == 0 iff dir1_name == dir2_name,
349 * i.e. string equality is equivalent to pointer equality. For this
350 * to hold, we have to be careful setting directory_name.
352 const char *directory_name
;
355 struct conflict_info
{
357 * merged: the version of the path that will be written to working tree
359 * WARNING: It is critical to check merged.clean and ensure it is 0
360 * before reading any conflict_info fields outside of merged.
361 * Allocated merge_info structs will always have clean set to 1.
362 * Allocated conflict_info structs will have merged.clean set to 0
363 * initially. The merged.clean field is how we know if it is safe
364 * to access other parts of conflict_info besides merged; if a
365 * conflict_info's merged.clean is changed to 1, the rest of the
366 * algorithm is not allowed to look at anything outside of the
367 * merged member anymore.
369 struct merged_info merged
;
371 /* oids & modes from each of the three trees for this path */
372 struct version_info stages
[3];
374 /* pathnames for each stage; may differ due to rename detection */
375 const char *pathnames
[3];
377 /* Whether this path is/was involved in a directory/file conflict */
378 unsigned df_conflict
:1;
381 * Whether this path is/was involved in a non-content conflict other
382 * than a directory/file conflict (e.g. rename/rename, rename/delete,
383 * file location based on possible directory rename).
385 unsigned path_conflict
:1;
388 * For filemask and dirmask, the ith bit corresponds to whether the
389 * ith entry is a file (filemask) or a directory (dirmask). Thus,
390 * filemask & dirmask is always zero, and filemask | dirmask is at
391 * most 7 but can be less when a path does not appear as either a
392 * file or a directory on at least one side of history.
394 * Note that these masks are related to enum merge_side, as the ith
395 * entry corresponds to side i.
397 * These values come from a traverse_trees() call; more info may be
398 * found looking at tree-walk.h's struct traverse_info,
399 * particularly the documentation above the "fn" member (note that
400 * filemask = mask & ~dirmask from that documentation).
406 * Optimization to track which stages match, to avoid the need to
407 * recompute it in multiple steps. Either 0 or at least 2 bits are
408 * set; if at least 2 bits are set, their corresponding stages match.
410 unsigned match_mask
:3;
413 /*** Function Grouping: various utility functions ***/
416 * For the next three macros, see warning for conflict_info.merged.
418 * In each of the below, mi is a struct merged_info*, and ci was defined
419 * as a struct conflict_info* (but we need to verify ci isn't actually
420 * pointed at a struct merged_info*).
422 * INITIALIZE_CI: Assign ci to mi but only if it's safe; set to NULL otherwise.
423 * VERIFY_CI: Ensure that something we assigned to a conflict_info* is one.
424 * ASSIGN_AND_VERIFY_CI: Similar to VERIFY_CI but do assignment first.
426 #define INITIALIZE_CI(ci, mi) do { \
427 (ci) = (!(mi) || (mi)->clean) ? NULL : (struct conflict_info *)(mi); \
429 #define VERIFY_CI(ci) assert(ci && !ci->merged.clean);
430 #define ASSIGN_AND_VERIFY_CI(ci, mi) do { \
431 (ci) = (struct conflict_info *)(mi); \
432 assert((ci) && !(mi)->clean); \
435 static void free_strmap_strings(struct strmap
*map
)
437 struct hashmap_iter iter
;
438 struct strmap_entry
*entry
;
440 strmap_for_each_entry(map
, &iter
, entry
) {
441 free((char*)entry
->key
);
445 static void clear_or_reinit_internal_opts(struct merge_options_internal
*opti
,
448 struct rename_info
*renames
= &opti
->renames
;
450 void (*strmap_func
)(struct strmap
*, int) =
451 reinitialize
? strmap_partial_clear
: strmap_clear
;
452 void (*strintmap_func
)(struct strintmap
*) =
453 reinitialize
? strintmap_partial_clear
: strintmap_clear
;
454 void (*strset_func
)(struct strset
*) =
455 reinitialize
? strset_partial_clear
: strset_clear
;
458 * We marked opti->paths with strdup_strings = 0, so that we
459 * wouldn't have to make another copy of the fullpath created by
460 * make_traverse_path from setup_path_info(). But, now that we've
461 * used it and have no other references to these strings, it is time
462 * to deallocate them.
464 free_strmap_strings(&opti
->paths
);
465 strmap_func(&opti
->paths
, 1);
468 * All keys and values in opti->conflicted are a subset of those in
469 * opti->paths. We don't want to deallocate anything twice, so we
470 * don't free the keys and we pass 0 for free_values.
472 strmap_func(&opti
->conflicted
, 0);
475 * opti->paths_to_free is similar to opti->paths; we created it with
476 * strdup_strings = 0 to avoid making _another_ copy of the fullpath
477 * but now that we've used it and have no other references to these
478 * strings, it is time to deallocate them. We do so by temporarily
479 * setting strdup_strings to 1.
481 opti
->paths_to_free
.strdup_strings
= 1;
482 string_list_clear(&opti
->paths_to_free
, 0);
483 opti
->paths_to_free
.strdup_strings
= 0;
485 if (opti
->attr_index
.cache_nr
) /* true iff opt->renormalize */
486 discard_index(&opti
->attr_index
);
488 /* Free memory used by various renames maps */
489 for (i
= MERGE_SIDE1
; i
<= MERGE_SIDE2
; ++i
) {
490 strintmap_func(&renames
->dirs_removed
[i
]);
491 strmap_func(&renames
->dir_renames
[i
], 0);
492 strintmap_func(&renames
->relevant_sources
[i
]);
494 assert(renames
->cached_pairs_valid_side
== 0);
495 if (i
!= renames
->cached_pairs_valid_side
) {
496 strset_func(&renames
->cached_target_names
[i
]);
497 strmap_func(&renames
->cached_pairs
[i
], 1);
498 strset_func(&renames
->cached_irrelevant
[i
]);
499 partial_clear_dir_rename_count(&renames
->dir_rename_count
[i
]);
501 strmap_clear(&renames
->dir_rename_count
[i
], 1);
504 renames
->cached_pairs_valid_side
= 0;
505 renames
->dir_rename_mask
= 0;
508 struct hashmap_iter iter
;
509 struct strmap_entry
*e
;
511 /* Release and free each strbuf found in output */
512 strmap_for_each_entry(&opti
->output
, &iter
, e
) {
513 struct strbuf
*sb
= e
->value
;
516 * While strictly speaking we don't need to free(sb)
517 * here because we could pass free_values=1 when
518 * calling strmap_clear() on opti->output, that would
519 * require strmap_clear to do another
520 * strmap_for_each_entry() loop, so we just free it
521 * while we're iterating anyway.
525 strmap_clear(&opti
->output
, 0);
528 /* Clean out callback_data as well. */
529 FREE_AND_NULL(renames
->callback_data
);
530 renames
->callback_data_nr
= renames
->callback_data_alloc
= 0;
533 static int err(struct merge_options
*opt
, const char *err
, ...)
536 struct strbuf sb
= STRBUF_INIT
;
538 strbuf_addstr(&sb
, "error: ");
539 va_start(params
, err
);
540 strbuf_vaddf(&sb
, err
, params
);
549 static void format_commit(struct strbuf
*sb
,
551 struct commit
*commit
)
553 struct merge_remote_desc
*desc
;
554 struct pretty_print_context ctx
= {0};
555 ctx
.abbrev
= DEFAULT_ABBREV
;
557 strbuf_addchars(sb
, ' ', indent
);
558 desc
= merge_remote_util(commit
);
560 strbuf_addf(sb
, "virtual %s\n", desc
->name
);
564 format_commit_message(commit
, "%h %s", sb
, &ctx
);
565 strbuf_addch(sb
, '\n');
568 __attribute__((format (printf
, 4, 5)))
569 static void path_msg(struct merge_options
*opt
,
571 int omittable_hint
, /* skippable under --remerge-diff */
572 const char *fmt
, ...)
575 struct strbuf
*sb
= strmap_get(&opt
->priv
->output
, path
);
577 sb
= xmalloc(sizeof(*sb
));
579 strmap_put(&opt
->priv
->output
, path
, sb
);
583 strbuf_vaddf(sb
, fmt
, ap
);
586 strbuf_addch(sb
, '\n');
589 /* add a string to a strbuf, but converting "/" to "_" */
590 static void add_flattened_path(struct strbuf
*out
, const char *s
)
593 strbuf_addstr(out
, s
);
594 for (; i
< out
->len
; i
++)
595 if (out
->buf
[i
] == '/')
599 static char *unique_path(struct strmap
*existing_paths
,
603 struct strbuf newpath
= STRBUF_INIT
;
607 strbuf_addf(&newpath
, "%s~", path
);
608 add_flattened_path(&newpath
, branch
);
610 base_len
= newpath
.len
;
611 while (strmap_contains(existing_paths
, newpath
.buf
)) {
612 strbuf_setlen(&newpath
, base_len
);
613 strbuf_addf(&newpath
, "_%d", suffix
++);
616 return strbuf_detach(&newpath
, NULL
);
619 /*** Function Grouping: functions related to collect_merge_info() ***/
621 static int traverse_trees_wrapper_callback(int n
,
623 unsigned long dirmask
,
624 struct name_entry
*names
,
625 struct traverse_info
*info
)
627 struct merge_options
*opt
= info
->data
;
628 struct rename_info
*renames
= &opt
->priv
->renames
;
629 unsigned filemask
= mask
& ~dirmask
;
633 if (!renames
->callback_data_traverse_path
)
634 renames
->callback_data_traverse_path
= xstrdup(info
->traverse_path
);
636 if (filemask
&& filemask
== renames
->dir_rename_mask
)
637 renames
->dir_rename_mask
= 0x07;
639 ALLOC_GROW(renames
->callback_data
, renames
->callback_data_nr
+ 1,
640 renames
->callback_data_alloc
);
641 renames
->callback_data
[renames
->callback_data_nr
].mask
= mask
;
642 renames
->callback_data
[renames
->callback_data_nr
].dirmask
= dirmask
;
643 COPY_ARRAY(renames
->callback_data
[renames
->callback_data_nr
].names
,
645 renames
->callback_data_nr
++;
651 * Much like traverse_trees(), BUT:
652 * - read all the tree entries FIRST, saving them
653 * - note that the above step provides an opportunity to compute necessary
654 * additional details before the "real" traversal
655 * - loop through the saved entries and call the original callback on them
657 static int traverse_trees_wrapper(struct index_state
*istate
,
660 struct traverse_info
*info
)
662 int ret
, i
, old_offset
;
663 traverse_callback_t old_fn
;
664 char *old_callback_data_traverse_path
;
665 struct merge_options
*opt
= info
->data
;
666 struct rename_info
*renames
= &opt
->priv
->renames
;
668 assert(renames
->dir_rename_mask
== 2 || renames
->dir_rename_mask
== 4);
670 old_callback_data_traverse_path
= renames
->callback_data_traverse_path
;
672 old_offset
= renames
->callback_data_nr
;
674 renames
->callback_data_traverse_path
= NULL
;
675 info
->fn
= traverse_trees_wrapper_callback
;
676 ret
= traverse_trees(istate
, n
, t
, info
);
680 info
->traverse_path
= renames
->callback_data_traverse_path
;
682 for (i
= old_offset
; i
< renames
->callback_data_nr
; ++i
) {
684 renames
->callback_data
[i
].mask
,
685 renames
->callback_data
[i
].dirmask
,
686 renames
->callback_data
[i
].names
,
690 renames
->callback_data_nr
= old_offset
;
691 free(renames
->callback_data_traverse_path
);
692 renames
->callback_data_traverse_path
= old_callback_data_traverse_path
;
693 info
->traverse_path
= NULL
;
697 static void setup_path_info(struct merge_options
*opt
,
698 struct string_list_item
*result
,
699 const char *current_dir_name
,
700 int current_dir_name_len
,
701 char *fullpath
, /* we'll take over ownership */
702 struct name_entry
*names
,
703 struct name_entry
*merged_version
,
704 unsigned is_null
, /* boolean */
705 unsigned df_conflict
, /* boolean */
708 int resolved
/* boolean */)
710 /* result->util is void*, so mi is a convenience typed variable */
711 struct merged_info
*mi
;
713 assert(!is_null
|| resolved
);
714 assert(!df_conflict
|| !resolved
); /* df_conflict implies !resolved */
715 assert(resolved
== (merged_version
!= NULL
));
717 mi
= xcalloc(1, resolved
? sizeof(struct merged_info
) :
718 sizeof(struct conflict_info
));
719 mi
->directory_name
= current_dir_name
;
720 mi
->basename_offset
= current_dir_name_len
;
721 mi
->clean
= !!resolved
;
723 mi
->result
.mode
= merged_version
->mode
;
724 oidcpy(&mi
->result
.oid
, &merged_version
->oid
);
725 mi
->is_null
= !!is_null
;
728 struct conflict_info
*ci
;
730 ASSIGN_AND_VERIFY_CI(ci
, mi
);
731 for (i
= MERGE_BASE
; i
<= MERGE_SIDE2
; i
++) {
732 ci
->pathnames
[i
] = fullpath
;
733 ci
->stages
[i
].mode
= names
[i
].mode
;
734 oidcpy(&ci
->stages
[i
].oid
, &names
[i
].oid
);
736 ci
->filemask
= filemask
;
737 ci
->dirmask
= dirmask
;
738 ci
->df_conflict
= !!df_conflict
;
741 * Assume is_null for now, but if we have entries
742 * under the directory then when it is complete in
743 * write_completed_directory() it'll update this.
744 * Also, for D/F conflicts, we have to handle the
745 * directory first, then clear this bit and process
746 * the file to see how it is handled -- that occurs
747 * near the top of process_entry().
751 strmap_put(&opt
->priv
->paths
, fullpath
, mi
);
752 result
->string
= fullpath
;
756 static void add_pair(struct merge_options
*opt
,
757 struct name_entry
*names
,
758 const char *pathname
,
760 unsigned is_add
/* if false, is_delete */,
762 unsigned dir_rename_mask
)
764 struct diff_filespec
*one
, *two
;
765 struct rename_info
*renames
= &opt
->priv
->renames
;
766 int names_idx
= is_add
? side
: 0;
769 if (strset_contains(&renames
->cached_target_names
[side
],
773 unsigned content_relevant
= (match_mask
== 0);
774 unsigned location_relevant
= (dir_rename_mask
== 0x07);
777 * If pathname is found in cached_irrelevant[side] due to
778 * previous pick but for this commit content is relevant,
779 * then we need to remove it from cached_irrelevant.
781 if (content_relevant
)
782 /* strset_remove is no-op if strset doesn't have key */
783 strset_remove(&renames
->cached_irrelevant
[side
],
787 * We do not need to re-detect renames for paths that we already
788 * know the pairing, i.e. for cached_pairs (or
789 * cached_irrelevant). However, handle_deferred_entries() needs
790 * to loop over the union of keys from relevant_sources[side] and
791 * cached_pairs[side], so for simplicity we set relevant_sources
792 * for all the cached_pairs too and then strip them back out in
793 * prune_cached_from_relevant() at the beginning of
794 * detect_regular_renames().
796 if (content_relevant
|| location_relevant
) {
797 /* content_relevant trumps location_relevant */
798 strintmap_set(&renames
->relevant_sources
[side
], pathname
,
799 content_relevant
? RELEVANT_CONTENT
: RELEVANT_LOCATION
);
803 * Avoid creating pair if we've already cached rename results.
804 * Note that we do this after setting relevant_sources[side]
805 * as noted in the comment above.
807 if (strmap_contains(&renames
->cached_pairs
[side
], pathname
) ||
808 strset_contains(&renames
->cached_irrelevant
[side
], pathname
))
812 one
= alloc_filespec(pathname
);
813 two
= alloc_filespec(pathname
);
814 fill_filespec(is_add
? two
: one
,
815 &names
[names_idx
].oid
, 1, names
[names_idx
].mode
);
816 diff_queue(&renames
->pairs
[side
], one
, two
);
819 static void collect_rename_info(struct merge_options
*opt
,
820 struct name_entry
*names
,
822 const char *fullname
,
827 struct rename_info
*renames
= &opt
->priv
->renames
;
831 * Update dir_rename_mask (determines ignore-rename-source validity)
833 * dir_rename_mask helps us keep track of when directory rename
834 * detection may be relevant. Basically, whenver a directory is
835 * removed on one side of history, and a file is added to that
836 * directory on the other side of history, directory rename
837 * detection is relevant (meaning we have to detect renames for all
838 * files within that directory to deduce where the directory
839 * moved). Also, whenever a directory needs directory rename
840 * detection, due to the "majority rules" choice for where to move
841 * it (see t6423 testcase 1f), we also need to detect renames for
842 * all files within subdirectories of that directory as well.
844 * Here we haven't looked at files within the directory yet, we are
845 * just looking at the directory itself. So, if we aren't yet in
846 * a case where a parent directory needed directory rename detection
847 * (i.e. dir_rename_mask != 0x07), and if the directory was removed
848 * on one side of history, record the mask of the other side of
849 * history in dir_rename_mask.
851 if (renames
->dir_rename_mask
!= 0x07 &&
852 (dirmask
== 3 || dirmask
== 5)) {
853 /* simple sanity check */
854 assert(renames
->dir_rename_mask
== 0 ||
855 renames
->dir_rename_mask
== (dirmask
& ~1));
856 /* update dir_rename_mask; have it record mask of new side */
857 renames
->dir_rename_mask
= (dirmask
& ~1);
860 /* Update dirs_removed, as needed */
861 if (dirmask
== 1 || dirmask
== 3 || dirmask
== 5) {
862 /* absent_mask = 0x07 - dirmask; sides = absent_mask/2 */
863 unsigned sides
= (0x07 - dirmask
)/2;
864 unsigned relevance
= (renames
->dir_rename_mask
== 0x07) ?
865 RELEVANT_FOR_ANCESTOR
: NOT_RELEVANT
;
867 * Record relevance of this directory. However, note that
868 * when collect_merge_info_callback() recurses into this
869 * directory and calls collect_rename_info() on paths
870 * within that directory, if we find a path that was added
871 * to this directory on the other side of history, we will
872 * upgrade this value to RELEVANT_FOR_SELF; see below.
875 strintmap_set(&renames
->dirs_removed
[1], fullname
,
878 strintmap_set(&renames
->dirs_removed
[2], fullname
,
883 * Here's the block that potentially upgrades to RELEVANT_FOR_SELF.
884 * When we run across a file added to a directory. In such a case,
885 * find the directory of the file and upgrade its relevance.
887 if (renames
->dir_rename_mask
== 0x07 &&
888 (filemask
== 2 || filemask
== 4)) {
890 * Need directory rename for parent directory on other side
891 * of history from added file. Thus
892 * side = (~filemask & 0x06) >> 1
894 * side = 3 - (filemask/2).
896 unsigned side
= 3 - (filemask
>> 1);
897 strintmap_set(&renames
->dirs_removed
[side
], dirname
,
901 if (filemask
== 0 || filemask
== 7)
904 for (side
= MERGE_SIDE1
; side
<= MERGE_SIDE2
; ++side
) {
905 unsigned side_mask
= (1 << side
);
907 /* Check for deletion on side */
908 if ((filemask
& 1) && !(filemask
& side_mask
))
909 add_pair(opt
, names
, fullname
, side
, 0 /* delete */,
910 match_mask
& filemask
,
911 renames
->dir_rename_mask
);
913 /* Check for addition on side */
914 if (!(filemask
& 1) && (filemask
& side_mask
))
915 add_pair(opt
, names
, fullname
, side
, 1 /* add */,
916 match_mask
& filemask
,
917 renames
->dir_rename_mask
);
921 static int collect_merge_info_callback(int n
,
923 unsigned long dirmask
,
924 struct name_entry
*names
,
925 struct traverse_info
*info
)
929 * common ancestor (mbase) has mask 1, and stored in index 0 of names
930 * head of side 1 (side1) has mask 2, and stored in index 1 of names
931 * head of side 2 (side2) has mask 4, and stored in index 2 of names
933 struct merge_options
*opt
= info
->data
;
934 struct merge_options_internal
*opti
= opt
->priv
;
935 struct rename_info
*renames
= &opt
->priv
->renames
;
936 struct string_list_item pi
; /* Path Info */
937 struct conflict_info
*ci
; /* typed alias to pi.util (which is void*) */
938 struct name_entry
*p
;
941 const char *dirname
= opti
->current_dir_name
;
942 unsigned prev_dir_rename_mask
= renames
->dir_rename_mask
;
943 unsigned filemask
= mask
& ~dirmask
;
944 unsigned match_mask
= 0; /* will be updated below */
945 unsigned mbase_null
= !(mask
& 1);
946 unsigned side1_null
= !(mask
& 2);
947 unsigned side2_null
= !(mask
& 4);
948 unsigned side1_matches_mbase
= (!side1_null
&& !mbase_null
&&
949 names
[0].mode
== names
[1].mode
&&
950 oideq(&names
[0].oid
, &names
[1].oid
));
951 unsigned side2_matches_mbase
= (!side2_null
&& !mbase_null
&&
952 names
[0].mode
== names
[2].mode
&&
953 oideq(&names
[0].oid
, &names
[2].oid
));
954 unsigned sides_match
= (!side1_null
&& !side2_null
&&
955 names
[1].mode
== names
[2].mode
&&
956 oideq(&names
[1].oid
, &names
[2].oid
));
959 * Note: When a path is a file on one side of history and a directory
960 * in another, we have a directory/file conflict. In such cases, if
961 * the conflict doesn't resolve from renames and deletions, then we
962 * always leave directories where they are and move files out of the
963 * way. Thus, while struct conflict_info has a df_conflict field to
964 * track such conflicts, we ignore that field for any directories at
965 * a path and only pay attention to it for files at the given path.
966 * The fact that we leave directories were they are also means that
967 * we do not need to worry about getting additional df_conflict
968 * information propagated from parent directories down to children
969 * (unlike, say traverse_trees_recursive() in unpack-trees.c, which
970 * sets a newinfo.df_conflicts field specifically to propagate it).
972 unsigned df_conflict
= (filemask
!= 0) && (dirmask
!= 0);
974 /* n = 3 is a fundamental assumption. */
976 BUG("Called collect_merge_info_callback wrong");
979 * A bunch of sanity checks verifying that traverse_trees() calls
980 * us the way I expect. Could just remove these at some point,
981 * though maybe they are helpful to future code readers.
983 assert(mbase_null
== is_null_oid(&names
[0].oid
));
984 assert(side1_null
== is_null_oid(&names
[1].oid
));
985 assert(side2_null
== is_null_oid(&names
[2].oid
));
986 assert(!mbase_null
|| !side1_null
|| !side2_null
);
987 assert(mask
> 0 && mask
< 8);
989 /* Determine match_mask */
990 if (side1_matches_mbase
)
991 match_mask
= (side2_matches_mbase
? 7 : 3);
992 else if (side2_matches_mbase
)
994 else if (sides_match
)
998 * Get the name of the relevant filepath, which we'll pass to
999 * setup_path_info() for tracking.
1004 len
= traverse_path_len(info
, p
->pathlen
);
1006 /* +1 in both of the following lines to include the NUL byte */
1007 fullpath
= xmalloc(len
+ 1);
1008 make_traverse_path(fullpath
, len
+ 1, info
, p
->path
, p
->pathlen
);
1011 * If mbase, side1, and side2 all match, we can resolve early. Even
1012 * if these are trees, there will be no renames or anything
1015 if (side1_matches_mbase
&& side2_matches_mbase
) {
1016 /* mbase, side1, & side2 all match; use mbase as resolution */
1017 setup_path_info(opt
, &pi
, dirname
, info
->pathlen
, fullpath
,
1018 names
, names
+0, mbase_null
, 0,
1019 filemask
, dirmask
, 1);
1024 * Gather additional information used in rename detection.
1026 collect_rename_info(opt
, names
, dirname
, fullpath
,
1027 filemask
, dirmask
, match_mask
);
1030 * Record information about the path so we can resolve later in
1033 setup_path_info(opt
, &pi
, dirname
, info
->pathlen
, fullpath
,
1034 names
, NULL
, 0, df_conflict
, filemask
, dirmask
, 0);
1038 ci
->match_mask
= match_mask
;
1040 /* If dirmask, recurse into subdirectories */
1042 struct traverse_info newinfo
;
1043 struct tree_desc t
[3];
1044 void *buf
[3] = {NULL
, NULL
, NULL
};
1045 const char *original_dir_name
;
1048 ci
->match_mask
&= filemask
;
1050 newinfo
.prev
= info
;
1051 newinfo
.name
= p
->path
;
1052 newinfo
.namelen
= p
->pathlen
;
1053 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, p
->pathlen
, 1);
1055 * If this directory we are about to recurse into cared about
1056 * its parent directory (the current directory) having a D/F
1057 * conflict, then we'd propagate the masks in this way:
1058 * newinfo.df_conflicts |= (mask & ~dirmask);
1059 * But we don't worry about propagating D/F conflicts. (See
1060 * comment near setting of local df_conflict variable near
1061 * the beginning of this function).
1064 for (i
= MERGE_BASE
; i
<= MERGE_SIDE2
; i
++) {
1065 if (i
== 1 && side1_matches_mbase
)
1067 else if (i
== 2 && side2_matches_mbase
)
1069 else if (i
== 2 && sides_match
)
1072 const struct object_id
*oid
= NULL
;
1074 oid
= &names
[i
].oid
;
1075 buf
[i
] = fill_tree_descriptor(opt
->repo
,
1081 original_dir_name
= opti
->current_dir_name
;
1082 opti
->current_dir_name
= pi
.string
;
1083 if (renames
->dir_rename_mask
== 0 ||
1084 renames
->dir_rename_mask
== 0x07)
1085 ret
= traverse_trees(NULL
, 3, t
, &newinfo
);
1087 ret
= traverse_trees_wrapper(NULL
, 3, t
, &newinfo
);
1088 opti
->current_dir_name
= original_dir_name
;
1089 renames
->dir_rename_mask
= prev_dir_rename_mask
;
1091 for (i
= MERGE_BASE
; i
<= MERGE_SIDE2
; i
++)
1101 static int collect_merge_info(struct merge_options
*opt
,
1102 struct tree
*merge_base
,
1107 struct tree_desc t
[3];
1108 struct traverse_info info
;
1110 opt
->priv
->toplevel_dir
= "";
1111 opt
->priv
->current_dir_name
= opt
->priv
->toplevel_dir
;
1112 setup_traverse_info(&info
, opt
->priv
->toplevel_dir
);
1113 info
.fn
= collect_merge_info_callback
;
1115 info
.show_all_errors
= 1;
1117 parse_tree(merge_base
);
1120 init_tree_desc(t
+ 0, merge_base
->buffer
, merge_base
->size
);
1121 init_tree_desc(t
+ 1, side1
->buffer
, side1
->size
);
1122 init_tree_desc(t
+ 2, side2
->buffer
, side2
->size
);
1124 trace2_region_enter("merge", "traverse_trees", opt
->repo
);
1125 ret
= traverse_trees(NULL
, 3, t
, &info
);
1126 trace2_region_leave("merge", "traverse_trees", opt
->repo
);
1131 /*** Function Grouping: functions related to threeway content merges ***/
1133 static int find_first_merges(struct repository
*repo
,
1137 struct object_array
*result
)
1140 struct object_array merges
= OBJECT_ARRAY_INIT
;
1141 struct commit
*commit
;
1142 int contains_another
;
1144 char merged_revision
[GIT_MAX_HEXSZ
+ 2];
1145 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1146 "--all", merged_revision
, NULL
};
1147 struct rev_info revs
;
1148 struct setup_revision_opt rev_opts
;
1150 memset(result
, 0, sizeof(struct object_array
));
1151 memset(&rev_opts
, 0, sizeof(rev_opts
));
1153 /* get all revisions that merge commit a */
1154 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1155 oid_to_hex(&a
->object
.oid
));
1156 repo_init_revisions(repo
, &revs
, NULL
);
1157 rev_opts
.submodule
= path
;
1158 /* FIXME: can't handle linked worktrees in submodules yet */
1159 revs
.single_worktree
= path
!= NULL
;
1160 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1162 /* save all revisions from the above list that contain b */
1163 if (prepare_revision_walk(&revs
))
1164 die("revision walk setup failed");
1165 while ((commit
= get_revision(&revs
)) != NULL
) {
1166 struct object
*o
= &(commit
->object
);
1167 if (in_merge_bases(b
, commit
))
1168 add_object_array(o
, NULL
, &merges
);
1170 reset_revision_walk();
1172 /* Now we've got all merges that contain a and b. Prune all
1173 * merges that contain another found merge and save them in
1176 for (i
= 0; i
< merges
.nr
; i
++) {
1177 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1179 contains_another
= 0;
1180 for (j
= 0; j
< merges
.nr
; j
++) {
1181 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1182 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1183 contains_another
= 1;
1188 if (!contains_another
)
1189 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1192 object_array_clear(&merges
);
1196 static int merge_submodule(struct merge_options
*opt
,
1198 const struct object_id
*o
,
1199 const struct object_id
*a
,
1200 const struct object_id
*b
,
1201 struct object_id
*result
)
1203 struct commit
*commit_o
, *commit_a
, *commit_b
;
1205 struct object_array merges
;
1206 struct strbuf sb
= STRBUF_INIT
;
1209 int search
= !opt
->priv
->call_depth
;
1211 /* store fallback answer in result in case we fail */
1212 oidcpy(result
, opt
->priv
->call_depth
? o
: a
);
1214 /* we can not handle deletion conflicts */
1222 if (add_submodule_odb(path
)) {
1223 path_msg(opt
, path
, 0,
1224 _("Failed to merge submodule %s (not checked out)"),
1229 if (!(commit_o
= lookup_commit_reference(opt
->repo
, o
)) ||
1230 !(commit_a
= lookup_commit_reference(opt
->repo
, a
)) ||
1231 !(commit_b
= lookup_commit_reference(opt
->repo
, b
))) {
1232 path_msg(opt
, path
, 0,
1233 _("Failed to merge submodule %s (commits not present)"),
1238 /* check whether both changes are forward */
1239 if (!in_merge_bases(commit_o
, commit_a
) ||
1240 !in_merge_bases(commit_o
, commit_b
)) {
1241 path_msg(opt
, path
, 0,
1242 _("Failed to merge submodule %s "
1243 "(commits don't follow merge-base)"),
1248 /* Case #1: a is contained in b or vice versa */
1249 if (in_merge_bases(commit_a
, commit_b
)) {
1251 path_msg(opt
, path
, 1,
1252 _("Note: Fast-forwarding submodule %s to %s"),
1253 path
, oid_to_hex(b
));
1256 if (in_merge_bases(commit_b
, commit_a
)) {
1258 path_msg(opt
, path
, 1,
1259 _("Note: Fast-forwarding submodule %s to %s"),
1260 path
, oid_to_hex(a
));
1265 * Case #2: There are one or more merges that contain a and b in
1266 * the submodule. If there is only one, then present it as a
1267 * suggestion to the user, but leave it marked unmerged so the
1268 * user needs to confirm the resolution.
1271 /* Skip the search if makes no sense to the calling context. */
1275 /* find commit which merges them */
1276 parent_count
= find_first_merges(opt
->repo
, path
, commit_a
, commit_b
,
1278 switch (parent_count
) {
1280 path_msg(opt
, path
, 0, _("Failed to merge submodule %s"), path
);
1284 format_commit(&sb
, 4,
1285 (struct commit
*)merges
.objects
[0].item
);
1286 path_msg(opt
, path
, 0,
1287 _("Failed to merge submodule %s, but a possible merge "
1288 "resolution exists:\n%s\n"),
1290 path_msg(opt
, path
, 1,
1291 _("If this is correct simply add it to the index "
1294 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1295 "which will accept this suggestion.\n"),
1296 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1297 strbuf_release(&sb
);
1300 for (i
= 0; i
< merges
.nr
; i
++)
1301 format_commit(&sb
, 4,
1302 (struct commit
*)merges
.objects
[i
].item
);
1303 path_msg(opt
, path
, 0,
1304 _("Failed to merge submodule %s, but multiple "
1305 "possible merges exist:\n%s"), path
, sb
.buf
);
1306 strbuf_release(&sb
);
1309 object_array_clear(&merges
);
1313 static void initialize_attr_index(struct merge_options
*opt
)
1316 * The renormalize_buffer() functions require attributes, and
1317 * annoyingly those can only be read from the working tree or from
1318 * an index_state. merge-ort doesn't have an index_state, so we
1319 * generate a fake one containing only attribute information.
1321 struct merged_info
*mi
;
1322 struct index_state
*attr_index
= &opt
->priv
->attr_index
;
1323 struct cache_entry
*ce
;
1325 attr_index
->initialized
= 1;
1327 if (!opt
->renormalize
)
1330 mi
= strmap_get(&opt
->priv
->paths
, GITATTRIBUTES_FILE
);
1335 int len
= strlen(GITATTRIBUTES_FILE
);
1336 ce
= make_empty_cache_entry(attr_index
, len
);
1337 ce
->ce_mode
= create_ce_mode(mi
->result
.mode
);
1338 ce
->ce_flags
= create_ce_flags(0);
1339 ce
->ce_namelen
= len
;
1340 oidcpy(&ce
->oid
, &mi
->result
.oid
);
1341 memcpy(ce
->name
, GITATTRIBUTES_FILE
, len
);
1342 add_index_entry(attr_index
, ce
,
1343 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
1344 get_stream_filter(attr_index
, GITATTRIBUTES_FILE
, &ce
->oid
);
1347 struct conflict_info
*ci
;
1349 ASSIGN_AND_VERIFY_CI(ci
, mi
);
1350 for (stage
= 0; stage
< 3; stage
++) {
1351 unsigned stage_mask
= (1 << stage
);
1353 if (!(ci
->filemask
& stage_mask
))
1355 len
= strlen(GITATTRIBUTES_FILE
);
1356 ce
= make_empty_cache_entry(attr_index
, len
);
1357 ce
->ce_mode
= create_ce_mode(ci
->stages
[stage
].mode
);
1358 ce
->ce_flags
= create_ce_flags(stage
);
1359 ce
->ce_namelen
= len
;
1360 oidcpy(&ce
->oid
, &ci
->stages
[stage
].oid
);
1361 memcpy(ce
->name
, GITATTRIBUTES_FILE
, len
);
1362 add_index_entry(attr_index
, ce
,
1363 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
1364 get_stream_filter(attr_index
, GITATTRIBUTES_FILE
,
1370 static int merge_3way(struct merge_options
*opt
,
1372 const struct object_id
*o
,
1373 const struct object_id
*a
,
1374 const struct object_id
*b
,
1375 const char *pathnames
[3],
1376 const int extra_marker_size
,
1377 mmbuffer_t
*result_buf
)
1379 mmfile_t orig
, src1
, src2
;
1380 struct ll_merge_options ll_opts
= {0};
1381 char *base
, *name1
, *name2
;
1384 if (!opt
->priv
->attr_index
.initialized
)
1385 initialize_attr_index(opt
);
1387 ll_opts
.renormalize
= opt
->renormalize
;
1388 ll_opts
.extra_marker_size
= extra_marker_size
;
1389 ll_opts
.xdl_opts
= opt
->xdl_opts
;
1391 if (opt
->priv
->call_depth
) {
1392 ll_opts
.virtual_ancestor
= 1;
1393 ll_opts
.variant
= 0;
1395 switch (opt
->recursive_variant
) {
1396 case MERGE_VARIANT_OURS
:
1397 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
1399 case MERGE_VARIANT_THEIRS
:
1400 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
1403 ll_opts
.variant
= 0;
1408 assert(pathnames
[0] && pathnames
[1] && pathnames
[2] && opt
->ancestor
);
1409 if (pathnames
[0] == pathnames
[1] && pathnames
[1] == pathnames
[2]) {
1410 base
= mkpathdup("%s", opt
->ancestor
);
1411 name1
= mkpathdup("%s", opt
->branch1
);
1412 name2
= mkpathdup("%s", opt
->branch2
);
1414 base
= mkpathdup("%s:%s", opt
->ancestor
, pathnames
[0]);
1415 name1
= mkpathdup("%s:%s", opt
->branch1
, pathnames
[1]);
1416 name2
= mkpathdup("%s:%s", opt
->branch2
, pathnames
[2]);
1419 read_mmblob(&orig
, o
);
1420 read_mmblob(&src1
, a
);
1421 read_mmblob(&src2
, b
);
1423 merge_status
= ll_merge(result_buf
, path
, &orig
, base
,
1424 &src1
, name1
, &src2
, name2
,
1425 &opt
->priv
->attr_index
, &ll_opts
);
1433 return merge_status
;
1436 static int handle_content_merge(struct merge_options
*opt
,
1438 const struct version_info
*o
,
1439 const struct version_info
*a
,
1440 const struct version_info
*b
,
1441 const char *pathnames
[3],
1442 const int extra_marker_size
,
1443 struct version_info
*result
)
1446 * path is the target location where we want to put the file, and
1447 * is used to determine any normalization rules in ll_merge.
1449 * The normal case is that path and all entries in pathnames are
1450 * identical, though renames can affect which path we got one of
1451 * the three blobs to merge on various sides of history.
1453 * extra_marker_size is the amount to extend conflict markers in
1454 * ll_merge; this is neeed if we have content merges of content
1455 * merges, which happens for example with rename/rename(2to1) and
1456 * rename/add conflicts.
1461 * handle_content_merge() needs both files to be of the same type, i.e.
1462 * both files OR both submodules OR both symlinks. Conflicting types
1463 * needs to be handled elsewhere.
1465 assert((S_IFMT
& a
->mode
) == (S_IFMT
& b
->mode
));
1468 if (a
->mode
== b
->mode
|| a
->mode
== o
->mode
)
1469 result
->mode
= b
->mode
;
1471 /* must be the 100644/100755 case */
1472 assert(S_ISREG(a
->mode
));
1473 result
->mode
= a
->mode
;
1474 clean
= (b
->mode
== o
->mode
);
1476 * FIXME: If opt->priv->call_depth && !clean, then we really
1477 * should not make result->mode match either a->mode or
1478 * b->mode; that causes t6036 "check conflicting mode for
1479 * regular file" to fail. It would be best to use some other
1480 * mode, but we'll confuse all kinds of stuff if we use one
1481 * where S_ISREG(result->mode) isn't true, and if we use
1482 * something like 0100666, then tree-walk.c's calls to
1483 * canon_mode() will just normalize that to 100644 for us and
1484 * thus not solve anything.
1486 * Figure out if there's some kind of way we can work around
1492 * Trivial oid merge.
1494 * Note: While one might assume that the next four lines would
1495 * be unnecessary due to the fact that match_mask is often
1496 * setup and already handled, renames don't always take care
1499 if (oideq(&a
->oid
, &b
->oid
) || oideq(&a
->oid
, &o
->oid
))
1500 oidcpy(&result
->oid
, &b
->oid
);
1501 else if (oideq(&b
->oid
, &o
->oid
))
1502 oidcpy(&result
->oid
, &a
->oid
);
1504 /* Remaining rules depend on file vs. submodule vs. symlink. */
1505 else if (S_ISREG(a
->mode
)) {
1506 mmbuffer_t result_buf
;
1507 int ret
= 0, merge_status
;
1511 * If 'o' is different type, treat it as null so we do a
1514 two_way
= ((S_IFMT
& o
->mode
) != (S_IFMT
& a
->mode
));
1516 merge_status
= merge_3way(opt
, path
,
1517 two_way
? null_oid() : &o
->oid
,
1519 pathnames
, extra_marker_size
,
1522 if ((merge_status
< 0) || !result_buf
.ptr
)
1523 ret
= err(opt
, _("Failed to execute internal merge"));
1526 write_object_file(result_buf
.ptr
, result_buf
.size
,
1527 blob_type
, &result
->oid
))
1528 ret
= err(opt
, _("Unable to add %s to database"),
1531 free(result_buf
.ptr
);
1534 clean
&= (merge_status
== 0);
1535 path_msg(opt
, path
, 1, _("Auto-merging %s"), path
);
1536 } else if (S_ISGITLINK(a
->mode
)) {
1537 int two_way
= ((S_IFMT
& o
->mode
) != (S_IFMT
& a
->mode
));
1538 clean
= merge_submodule(opt
, pathnames
[0],
1539 two_way
? null_oid() : &o
->oid
,
1540 &a
->oid
, &b
->oid
, &result
->oid
);
1541 if (opt
->priv
->call_depth
&& two_way
&& !clean
) {
1542 result
->mode
= o
->mode
;
1543 oidcpy(&result
->oid
, &o
->oid
);
1545 } else if (S_ISLNK(a
->mode
)) {
1546 if (opt
->priv
->call_depth
) {
1548 result
->mode
= o
->mode
;
1549 oidcpy(&result
->oid
, &o
->oid
);
1551 switch (opt
->recursive_variant
) {
1552 case MERGE_VARIANT_NORMAL
:
1554 oidcpy(&result
->oid
, &a
->oid
);
1556 case MERGE_VARIANT_OURS
:
1557 oidcpy(&result
->oid
, &a
->oid
);
1559 case MERGE_VARIANT_THEIRS
:
1560 oidcpy(&result
->oid
, &b
->oid
);
1565 BUG("unsupported object type in the tree: %06o for %s",
1571 /*** Function Grouping: functions related to detect_and_process_renames(), ***
1572 *** which are split into directory and regular rename detection sections. ***/
1574 /*** Function Grouping: functions related to directory rename detection ***/
1576 struct collision_info
{
1577 struct string_list source_files
;
1578 unsigned reported_already
:1;
1582 * Return a new string that replaces the beginning portion (which matches
1583 * rename_info->key), with rename_info->util.new_dir. In perl-speak:
1584 * new_path_name = (old_path =~ s/rename_info->key/rename_info->value/);
1586 * Caller must ensure that old_path starts with rename_info->key + '/'.
1588 static char *apply_dir_rename(struct strmap_entry
*rename_info
,
1589 const char *old_path
)
1591 struct strbuf new_path
= STRBUF_INIT
;
1592 const char *old_dir
= rename_info
->key
;
1593 const char *new_dir
= rename_info
->value
;
1594 int oldlen
, newlen
, new_dir_len
;
1596 oldlen
= strlen(old_dir
);
1597 if (*new_dir
== '\0')
1599 * If someone renamed/merged a subdirectory into the root
1600 * directory (e.g. 'some/subdir' -> ''), then we want to
1603 * as the rename; we need to make old_path + oldlen advance
1604 * past the '/' character.
1607 new_dir_len
= strlen(new_dir
);
1608 newlen
= new_dir_len
+ (strlen(old_path
) - oldlen
) + 1;
1609 strbuf_grow(&new_path
, newlen
);
1610 strbuf_add(&new_path
, new_dir
, new_dir_len
);
1611 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1613 return strbuf_detach(&new_path
, NULL
);
1616 static int path_in_way(struct strmap
*paths
, const char *path
, unsigned side_mask
)
1618 struct merged_info
*mi
= strmap_get(paths
, path
);
1619 struct conflict_info
*ci
;
1622 INITIALIZE_CI(ci
, mi
);
1623 return mi
->clean
|| (side_mask
& (ci
->filemask
| ci
->dirmask
));
1627 * See if there is a directory rename for path, and if there are any file
1628 * level conflicts on the given side for the renamed location. If there is
1629 * a rename and there are no conflicts, return the new name. Otherwise,
1632 static char *handle_path_level_conflicts(struct merge_options
*opt
,
1634 unsigned side_index
,
1635 struct strmap_entry
*rename_info
,
1636 struct strmap
*collisions
)
1638 char *new_path
= NULL
;
1639 struct collision_info
*c_info
;
1641 struct strbuf collision_paths
= STRBUF_INIT
;
1644 * entry has the mapping of old directory name to new directory name
1645 * that we want to apply to path.
1647 new_path
= apply_dir_rename(rename_info
, path
);
1649 BUG("Failed to apply directory rename!");
1652 * The caller needs to have ensured that it has pre-populated
1653 * collisions with all paths that map to new_path. Do a quick check
1654 * to ensure that's the case.
1656 c_info
= strmap_get(collisions
, new_path
);
1658 BUG("c_info is NULL");
1661 * Check for one-sided add/add/.../add conflicts, i.e.
1662 * where implicit renames from the other side doing
1663 * directory rename(s) can affect this side of history
1664 * to put multiple paths into the same location. Warn
1665 * and bail on directory renames for such paths.
1667 if (c_info
->reported_already
) {
1669 } else if (path_in_way(&opt
->priv
->paths
, new_path
, 1 << side_index
)) {
1670 c_info
->reported_already
= 1;
1671 strbuf_add_separated_string_list(&collision_paths
, ", ",
1672 &c_info
->source_files
);
1673 path_msg(opt
, new_path
, 0,
1674 _("CONFLICT (implicit dir rename): Existing file/dir "
1675 "at %s in the way of implicit directory rename(s) "
1676 "putting the following path(s) there: %s."),
1677 new_path
, collision_paths
.buf
);
1679 } else if (c_info
->source_files
.nr
> 1) {
1680 c_info
->reported_already
= 1;
1681 strbuf_add_separated_string_list(&collision_paths
, ", ",
1682 &c_info
->source_files
);
1683 path_msg(opt
, new_path
, 0,
1684 _("CONFLICT (implicit dir rename): Cannot map more "
1685 "than one path to %s; implicit directory renames "
1686 "tried to put these paths there: %s"),
1687 new_path
, collision_paths
.buf
);
1691 /* Free memory we no longer need */
1692 strbuf_release(&collision_paths
);
1693 if (!clean
&& new_path
) {
1701 static void get_provisional_directory_renames(struct merge_options
*opt
,
1705 struct hashmap_iter iter
;
1706 struct strmap_entry
*entry
;
1707 struct rename_info
*renames
= &opt
->priv
->renames
;
1711 * dir_rename_count: old_directory -> {new_directory -> count}
1713 * dir_renames: old_directory -> best_new_directory
1714 * where best_new_directory is the one with the unique highest count.
1716 strmap_for_each_entry(&renames
->dir_rename_count
[side
], &iter
, entry
) {
1717 const char *source_dir
= entry
->key
;
1718 struct strintmap
*counts
= entry
->value
;
1719 struct hashmap_iter count_iter
;
1720 struct strmap_entry
*count_entry
;
1723 const char *best
= NULL
;
1725 strintmap_for_each_entry(counts
, &count_iter
, count_entry
) {
1726 const char *target_dir
= count_entry
->key
;
1727 intptr_t count
= (intptr_t)count_entry
->value
;
1731 else if (count
> max
) {
1740 if (bad_max
== max
) {
1741 path_msg(opt
, source_dir
, 0,
1742 _("CONFLICT (directory rename split): "
1743 "Unclear where to rename %s to; it was "
1744 "renamed to multiple other directories, with "
1745 "no destination getting a majority of the "
1750 strmap_put(&renames
->dir_renames
[side
],
1751 source_dir
, (void*)best
);
1756 static void handle_directory_level_conflicts(struct merge_options
*opt
)
1758 struct hashmap_iter iter
;
1759 struct strmap_entry
*entry
;
1760 struct string_list duplicated
= STRING_LIST_INIT_NODUP
;
1761 struct rename_info
*renames
= &opt
->priv
->renames
;
1762 struct strmap
*side1_dir_renames
= &renames
->dir_renames
[MERGE_SIDE1
];
1763 struct strmap
*side2_dir_renames
= &renames
->dir_renames
[MERGE_SIDE2
];
1766 strmap_for_each_entry(side1_dir_renames
, &iter
, entry
) {
1767 if (strmap_contains(side2_dir_renames
, entry
->key
))
1768 string_list_append(&duplicated
, entry
->key
);
1771 for (i
= 0; i
< duplicated
.nr
; i
++) {
1772 strmap_remove(side1_dir_renames
, duplicated
.items
[i
].string
, 0);
1773 strmap_remove(side2_dir_renames
, duplicated
.items
[i
].string
, 0);
1775 string_list_clear(&duplicated
, 0);
1778 static struct strmap_entry
*check_dir_renamed(const char *path
,
1779 struct strmap
*dir_renames
)
1781 char *temp
= xstrdup(path
);
1783 struct strmap_entry
*e
= NULL
;
1785 while ((end
= strrchr(temp
, '/'))) {
1787 e
= strmap_get_entry(dir_renames
, temp
);
1795 static void compute_collisions(struct strmap
*collisions
,
1796 struct strmap
*dir_renames
,
1797 struct diff_queue_struct
*pairs
)
1801 strmap_init_with_options(collisions
, NULL
, 0);
1802 if (strmap_empty(dir_renames
))
1806 * Multiple files can be mapped to the same path due to directory
1807 * renames done by the other side of history. Since that other
1808 * side of history could have merged multiple directories into one,
1809 * if our side of history added the same file basename to each of
1810 * those directories, then all N of them would get implicitly
1811 * renamed by the directory rename detection into the same path,
1812 * and we'd get an add/add/.../add conflict, and all those adds
1813 * from *this* side of history. This is not representable in the
1814 * index, and users aren't going to easily be able to make sense of
1815 * it. So we need to provide a good warning about what's
1816 * happening, and fall back to no-directory-rename detection
1817 * behavior for those paths.
1819 * See testcases 9e and all of section 5 from t6043 for examples.
1821 for (i
= 0; i
< pairs
->nr
; ++i
) {
1822 struct strmap_entry
*rename_info
;
1823 struct collision_info
*collision_info
;
1825 struct diff_filepair
*pair
= pairs
->queue
[i
];
1827 if (pair
->status
!= 'A' && pair
->status
!= 'R')
1829 rename_info
= check_dir_renamed(pair
->two
->path
, dir_renames
);
1833 new_path
= apply_dir_rename(rename_info
, pair
->two
->path
);
1835 collision_info
= strmap_get(collisions
, new_path
);
1836 if (collision_info
) {
1839 CALLOC_ARRAY(collision_info
, 1);
1840 string_list_init(&collision_info
->source_files
, 0);
1841 strmap_put(collisions
, new_path
, collision_info
);
1843 string_list_insert(&collision_info
->source_files
,
1848 static char *check_for_directory_rename(struct merge_options
*opt
,
1850 unsigned side_index
,
1851 struct strmap
*dir_renames
,
1852 struct strmap
*dir_rename_exclusions
,
1853 struct strmap
*collisions
,
1856 char *new_path
= NULL
;
1857 struct strmap_entry
*rename_info
;
1858 struct strmap_entry
*otherinfo
= NULL
;
1859 const char *new_dir
;
1861 if (strmap_empty(dir_renames
))
1863 rename_info
= check_dir_renamed(path
, dir_renames
);
1866 /* old_dir = rename_info->key; */
1867 new_dir
= rename_info
->value
;
1870 * This next part is a little weird. We do not want to do an
1871 * implicit rename into a directory we renamed on our side, because
1872 * that will result in a spurious rename/rename(1to2) conflict. An
1874 * Base commit: dumbdir/afile, otherdir/bfile
1875 * Side 1: smrtdir/afile, otherdir/bfile
1876 * Side 2: dumbdir/afile, dumbdir/bfile
1877 * Here, while working on Side 1, we could notice that otherdir was
1878 * renamed/merged to dumbdir, and change the diff_filepair for
1879 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
1880 * 2 will notice the rename from dumbdir to smrtdir, and do the
1881 * transitive rename to move it from dumbdir/bfile to
1882 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
1883 * smrtdir, a rename/rename(1to2) conflict. We really just want
1884 * the file to end up in smrtdir. And the way to achieve that is
1885 * to not let Side1 do the rename to dumbdir, since we know that is
1886 * the source of one of our directory renames.
1888 * That's why otherinfo and dir_rename_exclusions is here.
1890 * As it turns out, this also prevents N-way transient rename
1891 * confusion; See testcases 9c and 9d of t6043.
1893 otherinfo
= strmap_get_entry(dir_rename_exclusions
, new_dir
);
1895 path_msg(opt
, rename_info
->key
, 1,
1896 _("WARNING: Avoiding applying %s -> %s rename "
1897 "to %s, because %s itself was renamed."),
1898 rename_info
->key
, new_dir
, path
, new_dir
);
1902 new_path
= handle_path_level_conflicts(opt
, path
, side_index
,
1903 rename_info
, collisions
);
1904 *clean_merge
&= (new_path
!= NULL
);
1909 static void apply_directory_rename_modifications(struct merge_options
*opt
,
1910 struct diff_filepair
*pair
,
1914 * The basic idea is to get the conflict_info from opt->priv->paths
1915 * at old path, and insert it into new_path; basically just this:
1916 * ci = strmap_get(&opt->priv->paths, old_path);
1917 * strmap_remove(&opt->priv->paths, old_path, 0);
1918 * strmap_put(&opt->priv->paths, new_path, ci);
1919 * However, there are some factors complicating this:
1920 * - opt->priv->paths may already have an entry at new_path
1921 * - Each ci tracks its containing directory, so we need to
1923 * - If another ci has the same containing directory, then
1924 * the two char*'s MUST point to the same location. See the
1925 * comment in struct merged_info. strcmp equality is not
1926 * enough; we need pointer equality.
1927 * - opt->priv->paths must hold the parent directories of any
1928 * entries that are added. So, if this directory rename
1929 * causes entirely new directories, we must recursively add
1930 * parent directories.
1931 * - For each parent directory added to opt->priv->paths, we
1932 * also need to get its parent directory stored in its
1933 * conflict_info->merged.directory_name with all the same
1934 * requirements about pointer equality.
1936 struct string_list dirs_to_insert
= STRING_LIST_INIT_NODUP
;
1937 struct conflict_info
*ci
, *new_ci
;
1938 struct strmap_entry
*entry
;
1939 const char *branch_with_new_path
, *branch_with_dir_rename
;
1940 const char *old_path
= pair
->two
->path
;
1941 const char *parent_name
;
1942 const char *cur_path
;
1945 entry
= strmap_get_entry(&opt
->priv
->paths
, old_path
);
1946 old_path
= entry
->key
;
1950 /* Find parent directories missing from opt->priv->paths */
1951 cur_path
= new_path
;
1953 /* Find the parent directory of cur_path */
1954 char *last_slash
= strrchr(cur_path
, '/');
1956 parent_name
= xstrndup(cur_path
, last_slash
- cur_path
);
1958 parent_name
= opt
->priv
->toplevel_dir
;
1962 /* Look it up in opt->priv->paths */
1963 entry
= strmap_get_entry(&opt
->priv
->paths
, parent_name
);
1965 free((char*)parent_name
);
1966 parent_name
= entry
->key
; /* reuse known pointer */
1970 /* Record this is one of the directories we need to insert */
1971 string_list_append(&dirs_to_insert
, parent_name
);
1972 cur_path
= parent_name
;
1975 /* Traverse dirs_to_insert and insert them into opt->priv->paths */
1976 for (i
= dirs_to_insert
.nr
-1; i
>= 0; --i
) {
1977 struct conflict_info
*dir_ci
;
1978 char *cur_dir
= dirs_to_insert
.items
[i
].string
;
1980 CALLOC_ARRAY(dir_ci
, 1);
1982 dir_ci
->merged
.directory_name
= parent_name
;
1983 len
= strlen(parent_name
);
1984 /* len+1 because of trailing '/' character */
1985 dir_ci
->merged
.basename_offset
= (len
> 0 ? len
+1 : len
);
1986 dir_ci
->dirmask
= ci
->filemask
;
1987 strmap_put(&opt
->priv
->paths
, cur_dir
, dir_ci
);
1989 parent_name
= cur_dir
;
1993 * We are removing old_path from opt->priv->paths. old_path also will
1994 * eventually need to be freed, but it may still be used by e.g.
1995 * ci->pathnames. So, store it in another string-list for now.
1997 string_list_append(&opt
->priv
->paths_to_free
, old_path
);
1999 assert(ci
->filemask
== 2 || ci
->filemask
== 4);
2000 assert(ci
->dirmask
== 0);
2001 strmap_remove(&opt
->priv
->paths
, old_path
, 0);
2003 branch_with_new_path
= (ci
->filemask
== 2) ? opt
->branch1
: opt
->branch2
;
2004 branch_with_dir_rename
= (ci
->filemask
== 2) ? opt
->branch2
: opt
->branch1
;
2006 /* Now, finally update ci and stick it into opt->priv->paths */
2007 ci
->merged
.directory_name
= parent_name
;
2008 len
= strlen(parent_name
);
2009 ci
->merged
.basename_offset
= (len
> 0 ? len
+1 : len
);
2010 new_ci
= strmap_get(&opt
->priv
->paths
, new_path
);
2012 /* Place ci back into opt->priv->paths, but at new_path */
2013 strmap_put(&opt
->priv
->paths
, new_path
, ci
);
2017 /* A few sanity checks */
2019 assert(ci
->filemask
== 2 || ci
->filemask
== 4);
2020 assert((new_ci
->filemask
& ci
->filemask
) == 0);
2021 assert(!new_ci
->merged
.clean
);
2023 /* Copy stuff from ci into new_ci */
2024 new_ci
->filemask
|= ci
->filemask
;
2025 if (new_ci
->dirmask
)
2026 new_ci
->df_conflict
= 1;
2027 index
= (ci
->filemask
>> 1);
2028 new_ci
->pathnames
[index
] = ci
->pathnames
[index
];
2029 new_ci
->stages
[index
].mode
= ci
->stages
[index
].mode
;
2030 oidcpy(&new_ci
->stages
[index
].oid
, &ci
->stages
[index
].oid
);
2036 if (opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_TRUE
) {
2037 /* Notify user of updated path */
2038 if (pair
->status
== 'A')
2039 path_msg(opt
, new_path
, 1,
2040 _("Path updated: %s added in %s inside a "
2041 "directory that was renamed in %s; moving "
2043 old_path
, branch_with_new_path
,
2044 branch_with_dir_rename
, new_path
);
2046 path_msg(opt
, new_path
, 1,
2047 _("Path updated: %s renamed to %s in %s, "
2048 "inside a directory that was renamed in %s; "
2049 "moving it to %s."),
2050 pair
->one
->path
, old_path
, branch_with_new_path
,
2051 branch_with_dir_rename
, new_path
);
2054 * opt->detect_directory_renames has the value
2055 * MERGE_DIRECTORY_RENAMES_CONFLICT, so mark these as conflicts.
2057 ci
->path_conflict
= 1;
2058 if (pair
->status
== 'A')
2059 path_msg(opt
, new_path
, 0,
2060 _("CONFLICT (file location): %s added in %s "
2061 "inside a directory that was renamed in %s, "
2062 "suggesting it should perhaps be moved to "
2064 old_path
, branch_with_new_path
,
2065 branch_with_dir_rename
, new_path
);
2067 path_msg(opt
, new_path
, 0,
2068 _("CONFLICT (file location): %s renamed to %s "
2069 "in %s, inside a directory that was renamed "
2070 "in %s, suggesting it should perhaps be "
2072 pair
->one
->path
, old_path
, branch_with_new_path
,
2073 branch_with_dir_rename
, new_path
);
2077 * Finally, record the new location.
2079 pair
->two
->path
= new_path
;
2082 /*** Function Grouping: functions related to regular rename detection ***/
2084 static int process_renames(struct merge_options
*opt
,
2085 struct diff_queue_struct
*renames
)
2087 int clean_merge
= 1, i
;
2089 for (i
= 0; i
< renames
->nr
; ++i
) {
2090 const char *oldpath
= NULL
, *newpath
;
2091 struct diff_filepair
*pair
= renames
->queue
[i
];
2092 struct conflict_info
*oldinfo
= NULL
, *newinfo
= NULL
;
2093 struct strmap_entry
*old_ent
, *new_ent
;
2094 unsigned int old_sidemask
;
2095 int target_index
, other_source_index
;
2096 int source_deleted
, collision
, type_changed
;
2097 const char *rename_branch
= NULL
, *delete_branch
= NULL
;
2099 old_ent
= strmap_get_entry(&opt
->priv
->paths
, pair
->one
->path
);
2100 new_ent
= strmap_get_entry(&opt
->priv
->paths
, pair
->two
->path
);
2102 oldpath
= old_ent
->key
;
2103 oldinfo
= old_ent
->value
;
2105 newpath
= pair
->two
->path
;
2107 newpath
= new_ent
->key
;
2108 newinfo
= new_ent
->value
;
2112 * If pair->one->path isn't in opt->priv->paths, that means
2113 * that either directory rename detection removed that
2114 * path, or a parent directory of oldpath was resolved and
2115 * we don't even need the rename; in either case, we can
2116 * skip it. If oldinfo->merged.clean, then the other side
2117 * of history had no changes to oldpath and we don't need
2118 * the rename and can skip it.
2120 if (!oldinfo
|| oldinfo
->merged
.clean
)
2124 * diff_filepairs have copies of pathnames, thus we have to
2125 * use standard 'strcmp()' (negated) instead of '=='.
2127 if (i
+ 1 < renames
->nr
&&
2128 !strcmp(oldpath
, renames
->queue
[i
+1]->one
->path
)) {
2129 /* Handle rename/rename(1to2) or rename/rename(1to1) */
2130 const char *pathnames
[3];
2131 struct version_info merged
;
2132 struct conflict_info
*base
, *side1
, *side2
;
2133 unsigned was_binary_blob
= 0;
2135 pathnames
[0] = oldpath
;
2136 pathnames
[1] = newpath
;
2137 pathnames
[2] = renames
->queue
[i
+1]->two
->path
;
2139 base
= strmap_get(&opt
->priv
->paths
, pathnames
[0]);
2140 side1
= strmap_get(&opt
->priv
->paths
, pathnames
[1]);
2141 side2
= strmap_get(&opt
->priv
->paths
, pathnames
[2]);
2147 if (!strcmp(pathnames
[1], pathnames
[2])) {
2148 struct rename_info
*ri
= &opt
->priv
->renames
;
2151 /* Both sides renamed the same way */
2152 assert(side1
== side2
);
2153 memcpy(&side1
->stages
[0], &base
->stages
[0],
2155 side1
->filemask
|= (1 << MERGE_BASE
);
2156 /* Mark base as resolved by removal */
2157 base
->merged
.is_null
= 1;
2158 base
->merged
.clean
= 1;
2161 * Disable remembering renames optimization;
2162 * rename/rename(1to1) is incredibly rare, and
2163 * just disabling the optimization is easier
2164 * than purging cached_pairs,
2165 * cached_target_names, and dir_rename_counts.
2167 for (j
= 0; j
< 3; j
++)
2168 ri
->merge_trees
[j
] = NULL
;
2170 /* We handled both renames, i.e. i+1 handled */
2172 /* Move to next rename */
2176 /* This is a rename/rename(1to2) */
2177 clean_merge
= handle_content_merge(opt
,
2183 1 + 2 * opt
->priv
->call_depth
,
2186 merged
.mode
== side1
->stages
[1].mode
&&
2187 oideq(&merged
.oid
, &side1
->stages
[1].oid
))
2188 was_binary_blob
= 1;
2189 memcpy(&side1
->stages
[1], &merged
, sizeof(merged
));
2190 if (was_binary_blob
) {
2192 * Getting here means we were attempting to
2193 * merge a binary blob.
2195 * Since we can't merge binaries,
2196 * handle_content_merge() just takes one
2197 * side. But we don't want to copy the
2198 * contents of one side to both paths. We
2199 * used the contents of side1 above for
2200 * side1->stages, let's use the contents of
2201 * side2 for side2->stages below.
2203 oidcpy(&merged
.oid
, &side2
->stages
[2].oid
);
2204 merged
.mode
= side2
->stages
[2].mode
;
2206 memcpy(&side2
->stages
[2], &merged
, sizeof(merged
));
2208 side1
->path_conflict
= 1;
2209 side2
->path_conflict
= 1;
2211 * TODO: For renames we normally remove the path at the
2212 * old name. It would thus seem consistent to do the
2213 * same for rename/rename(1to2) cases, but we haven't
2214 * done so traditionally and a number of the regression
2215 * tests now encode an expectation that the file is
2216 * left there at stage 1. If we ever decide to change
2217 * this, add the following two lines here:
2218 * base->merged.is_null = 1;
2219 * base->merged.clean = 1;
2220 * and remove the setting of base->path_conflict to 1.
2222 base
->path_conflict
= 1;
2223 path_msg(opt
, oldpath
, 0,
2224 _("CONFLICT (rename/rename): %s renamed to "
2225 "%s in %s and to %s in %s."),
2227 pathnames
[1], opt
->branch1
,
2228 pathnames
[2], opt
->branch2
);
2230 i
++; /* We handled both renames, i.e. i+1 handled */
2236 target_index
= pair
->score
; /* from collect_renames() */
2237 assert(target_index
== 1 || target_index
== 2);
2238 other_source_index
= 3 - target_index
;
2239 old_sidemask
= (1 << other_source_index
); /* 2 or 4 */
2240 source_deleted
= (oldinfo
->filemask
== 1);
2241 collision
= ((newinfo
->filemask
& old_sidemask
) != 0);
2242 type_changed
= !source_deleted
&&
2243 (S_ISREG(oldinfo
->stages
[other_source_index
].mode
) !=
2244 S_ISREG(newinfo
->stages
[target_index
].mode
));
2245 if (type_changed
&& collision
) {
2247 * special handling so later blocks can handle this...
2249 * if type_changed && collision are both true, then this
2250 * was really a double rename, but one side wasn't
2251 * detected due to lack of break detection. I.e.
2253 * orig: has normal file 'foo'
2254 * side1: renames 'foo' to 'bar', adds 'foo' symlink
2255 * side2: renames 'foo' to 'bar'
2256 * In this case, the foo->bar rename on side1 won't be
2257 * detected because the new symlink named 'foo' is
2258 * there and we don't do break detection. But we detect
2259 * this here because we don't want to merge the content
2260 * of the foo symlink with the foo->bar file, so we
2261 * have some logic to handle this special case. The
2262 * easiest way to do that is make 'bar' on side1 not
2263 * be considered a colliding file but the other part
2264 * of a normal rename. If the file is very different,
2265 * well we're going to get content merge conflicts
2266 * anyway so it doesn't hurt. And if the colliding
2267 * file also has a different type, that'll be handled
2268 * by the content merge logic in process_entry() too.
2270 * See also t6430, 'rename vs. rename/symlink'
2274 if (source_deleted
) {
2275 if (target_index
== 1) {
2276 rename_branch
= opt
->branch1
;
2277 delete_branch
= opt
->branch2
;
2279 rename_branch
= opt
->branch2
;
2280 delete_branch
= opt
->branch1
;
2284 assert(source_deleted
|| oldinfo
->filemask
& old_sidemask
);
2286 /* Need to check for special types of rename conflicts... */
2287 if (collision
&& !source_deleted
) {
2288 /* collision: rename/add or rename/rename(2to1) */
2289 const char *pathnames
[3];
2290 struct version_info merged
;
2292 struct conflict_info
*base
, *side1
, *side2
;
2295 pathnames
[0] = oldpath
;
2296 pathnames
[other_source_index
] = oldpath
;
2297 pathnames
[target_index
] = newpath
;
2299 base
= strmap_get(&opt
->priv
->paths
, pathnames
[0]);
2300 side1
= strmap_get(&opt
->priv
->paths
, pathnames
[1]);
2301 side2
= strmap_get(&opt
->priv
->paths
, pathnames
[2]);
2307 clean
= handle_content_merge(opt
, pair
->one
->path
,
2312 1 + 2 * opt
->priv
->call_depth
,
2315 memcpy(&newinfo
->stages
[target_index
], &merged
,
2318 path_msg(opt
, newpath
, 0,
2319 _("CONFLICT (rename involved in "
2320 "collision): rename of %s -> %s has "
2321 "content conflicts AND collides "
2322 "with another path; this may result "
2323 "in nested conflict markers."),
2326 } else if (collision
&& source_deleted
) {
2328 * rename/add/delete or rename/rename(2to1)/delete:
2329 * since oldpath was deleted on the side that didn't
2330 * do the rename, there's not much of a content merge
2331 * we can do for the rename. oldinfo->merged.is_null
2332 * was already set, so we just leave things as-is so
2333 * they look like an add/add conflict.
2336 newinfo
->path_conflict
= 1;
2337 path_msg(opt
, newpath
, 0,
2338 _("CONFLICT (rename/delete): %s renamed "
2339 "to %s in %s, but deleted in %s."),
2340 oldpath
, newpath
, rename_branch
, delete_branch
);
2343 * a few different cases...start by copying the
2344 * existing stage(s) from oldinfo over the newinfo
2345 * and update the pathname(s).
2347 memcpy(&newinfo
->stages
[0], &oldinfo
->stages
[0],
2348 sizeof(newinfo
->stages
[0]));
2349 newinfo
->filemask
|= (1 << MERGE_BASE
);
2350 newinfo
->pathnames
[0] = oldpath
;
2352 /* rename vs. typechange */
2353 /* Mark the original as resolved by removal */
2354 memcpy(&oldinfo
->stages
[0].oid
, null_oid(),
2355 sizeof(oldinfo
->stages
[0].oid
));
2356 oldinfo
->stages
[0].mode
= 0;
2357 oldinfo
->filemask
&= 0x06;
2358 } else if (source_deleted
) {
2360 newinfo
->path_conflict
= 1;
2361 path_msg(opt
, newpath
, 0,
2362 _("CONFLICT (rename/delete): %s renamed"
2363 " to %s in %s, but deleted in %s."),
2365 rename_branch
, delete_branch
);
2368 memcpy(&newinfo
->stages
[other_source_index
],
2369 &oldinfo
->stages
[other_source_index
],
2370 sizeof(newinfo
->stages
[0]));
2371 newinfo
->filemask
|= (1 << other_source_index
);
2372 newinfo
->pathnames
[other_source_index
] = oldpath
;
2376 if (!type_changed
) {
2377 /* Mark the original as resolved by removal */
2378 oldinfo
->merged
.is_null
= 1;
2379 oldinfo
->merged
.clean
= 1;
2387 static inline int possible_side_renames(struct rename_info
*renames
,
2388 unsigned side_index
)
2390 return renames
->pairs
[side_index
].nr
> 0 &&
2391 !strintmap_empty(&renames
->relevant_sources
[side_index
]);
2394 static inline int possible_renames(struct rename_info
*renames
)
2396 return possible_side_renames(renames
, 1) ||
2397 possible_side_renames(renames
, 2) ||
2398 !strmap_empty(&renames
->cached_pairs
[1]) ||
2399 !strmap_empty(&renames
->cached_pairs
[2]);
2402 static void resolve_diffpair_statuses(struct diff_queue_struct
*q
)
2405 * A simplified version of diff_resolve_rename_copy(); would probably
2406 * just use that function but it's static...
2409 struct diff_filepair
*p
;
2411 for (i
= 0; i
< q
->nr
; ++i
) {
2413 p
->status
= 0; /* undecided */
2414 if (!DIFF_FILE_VALID(p
->one
))
2415 p
->status
= DIFF_STATUS_ADDED
;
2416 else if (!DIFF_FILE_VALID(p
->two
))
2417 p
->status
= DIFF_STATUS_DELETED
;
2418 else if (DIFF_PAIR_RENAME(p
))
2419 p
->status
= DIFF_STATUS_RENAMED
;
2423 static void prune_cached_from_relevant(struct rename_info
*renames
,
2426 /* Reason for this function described in add_pair() */
2427 struct hashmap_iter iter
;
2428 struct strmap_entry
*entry
;
2430 /* Remove from relevant_sources all entries in cached_pairs[side] */
2431 strmap_for_each_entry(&renames
->cached_pairs
[side
], &iter
, entry
) {
2432 strintmap_remove(&renames
->relevant_sources
[side
],
2435 /* Remove from relevant_sources all entries in cached_irrelevant[side] */
2436 strset_for_each_entry(&renames
->cached_irrelevant
[side
], &iter
, entry
) {
2437 strintmap_remove(&renames
->relevant_sources
[side
],
2442 static void use_cached_pairs(struct merge_options
*opt
,
2443 struct strmap
*cached_pairs
,
2444 struct diff_queue_struct
*pairs
)
2446 struct hashmap_iter iter
;
2447 struct strmap_entry
*entry
;
2450 * Add to side_pairs all entries from renames->cached_pairs[side_index].
2451 * (Info in cached_irrelevant[side_index] is not relevant here.)
2453 strmap_for_each_entry(cached_pairs
, &iter
, entry
) {
2454 struct diff_filespec
*one
, *two
;
2455 const char *old_name
= entry
->key
;
2456 const char *new_name
= entry
->value
;
2458 new_name
= old_name
;
2460 /* We don't care about oid/mode, only filenames and status */
2461 one
= alloc_filespec(old_name
);
2462 two
= alloc_filespec(new_name
);
2463 diff_queue(pairs
, one
, two
);
2464 pairs
->queue
[pairs
->nr
-1]->status
= entry
->value
? 'R' : 'D';
2468 static void cache_new_pair(struct rename_info
*renames
,
2475 new_path
= xstrdup(new_path
);
2476 old_value
= strmap_put(&renames
->cached_pairs
[side
],
2477 old_path
, new_path
);
2478 strset_add(&renames
->cached_target_names
[side
], new_path
);
2485 static void possibly_cache_new_pair(struct rename_info
*renames
,
2486 struct diff_filepair
*p
,
2490 int dir_renamed_side
= 0;
2494 * Directory renames happen on the other side of history from
2495 * the side that adds new files to the old directory.
2497 dir_renamed_side
= 3 - side
;
2499 int val
= strintmap_get(&renames
->relevant_sources
[side
],
2501 if (val
== RELEVANT_NO_MORE
) {
2502 assert(p
->status
== 'D');
2503 strset_add(&renames
->cached_irrelevant
[side
],
2510 if (p
->status
== 'D') {
2512 * If we already had this delete, we'll just set it's value
2513 * to NULL again, so no harm.
2515 strmap_put(&renames
->cached_pairs
[side
], p
->one
->path
, NULL
);
2516 } else if (p
->status
== 'R') {
2518 new_path
= p
->two
->path
;
2520 cache_new_pair(renames
, dir_renamed_side
,
2521 p
->two
->path
, new_path
, 0);
2522 cache_new_pair(renames
, side
, p
->one
->path
, new_path
, 1);
2523 } else if (p
->status
== 'A' && new_path
) {
2524 cache_new_pair(renames
, dir_renamed_side
,
2525 p
->two
->path
, new_path
, 0);
2529 static int compare_pairs(const void *a_
, const void *b_
)
2531 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
2532 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
2534 return strcmp(a
->one
->path
, b
->one
->path
);
2537 /* Call diffcore_rename() to compute which files have changed on given side */
2538 static void detect_regular_renames(struct merge_options
*opt
,
2539 unsigned side_index
)
2541 struct diff_options diff_opts
;
2542 struct rename_info
*renames
= &opt
->priv
->renames
;
2544 prune_cached_from_relevant(renames
, side_index
);
2545 if (!possible_side_renames(renames
, side_index
)) {
2547 * No rename detection needed for this side, but we still need
2548 * to make sure 'adds' are marked correctly in case the other
2549 * side had directory renames.
2551 resolve_diffpair_statuses(&renames
->pairs
[side_index
]);
2555 partial_clear_dir_rename_count(&renames
->dir_rename_count
[side_index
]);
2556 repo_diff_setup(opt
->repo
, &diff_opts
);
2557 diff_opts
.flags
.recursive
= 1;
2558 diff_opts
.flags
.rename_empty
= 0;
2559 diff_opts
.detect_rename
= DIFF_DETECT_RENAME
;
2560 diff_opts
.rename_limit
= opt
->rename_limit
;
2561 if (opt
->rename_limit
<= 0)
2562 diff_opts
.rename_limit
= 1000;
2563 diff_opts
.rename_score
= opt
->rename_score
;
2564 diff_opts
.show_rename_progress
= opt
->show_rename_progress
;
2565 diff_opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
2566 diff_setup_done(&diff_opts
);
2568 diff_queued_diff
= renames
->pairs
[side_index
];
2569 trace2_region_enter("diff", "diffcore_rename", opt
->repo
);
2570 diffcore_rename_extended(&diff_opts
,
2571 &renames
->relevant_sources
[side_index
],
2572 &renames
->dirs_removed
[side_index
],
2573 &renames
->dir_rename_count
[side_index
],
2574 &renames
->cached_pairs
[side_index
]);
2575 trace2_region_leave("diff", "diffcore_rename", opt
->repo
);
2576 resolve_diffpair_statuses(&diff_queued_diff
);
2578 if (diff_opts
.needed_rename_limit
> renames
->needed_limit
)
2579 renames
->needed_limit
= diff_opts
.needed_rename_limit
;
2581 renames
->pairs
[side_index
] = diff_queued_diff
;
2583 diff_opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
2584 diff_queued_diff
.nr
= 0;
2585 diff_queued_diff
.queue
= NULL
;
2586 diff_flush(&diff_opts
);
2590 * Get information of all renames which occurred in 'side_pairs', discarding
2593 static int collect_renames(struct merge_options
*opt
,
2594 struct diff_queue_struct
*result
,
2595 unsigned side_index
,
2596 struct strmap
*dir_renames_for_side
,
2597 struct strmap
*rename_exclusions
)
2600 struct strmap collisions
;
2601 struct diff_queue_struct
*side_pairs
;
2602 struct hashmap_iter iter
;
2603 struct strmap_entry
*entry
;
2604 struct rename_info
*renames
= &opt
->priv
->renames
;
2606 side_pairs
= &renames
->pairs
[side_index
];
2607 compute_collisions(&collisions
, dir_renames_for_side
, side_pairs
);
2609 for (i
= 0; i
< side_pairs
->nr
; ++i
) {
2610 struct diff_filepair
*p
= side_pairs
->queue
[i
];
2611 char *new_path
; /* non-NULL only with directory renames */
2613 if (p
->status
!= 'A' && p
->status
!= 'R') {
2614 possibly_cache_new_pair(renames
, p
, side_index
, NULL
);
2615 diff_free_filepair(p
);
2619 new_path
= check_for_directory_rename(opt
, p
->two
->path
,
2621 dir_renames_for_side
,
2626 possibly_cache_new_pair(renames
, p
, side_index
, new_path
);
2627 if (p
->status
!= 'R' && !new_path
) {
2628 diff_free_filepair(p
);
2633 apply_directory_rename_modifications(opt
, p
, new_path
);
2636 * p->score comes back from diffcore_rename_extended() with
2637 * the similarity of the renamed file. The similarity is
2638 * was used to determine that the two files were related
2639 * and are a rename, which we have already used, but beyond
2640 * that we have no use for the similarity. So p->score is
2641 * now irrelevant. However, process_renames() will need to
2642 * know which side of the merge this rename was associated
2643 * with, so overwrite p->score with that value.
2645 p
->score
= side_index
;
2646 result
->queue
[result
->nr
++] = p
;
2649 /* Free each value in the collisions map */
2650 strmap_for_each_entry(&collisions
, &iter
, entry
) {
2651 struct collision_info
*info
= entry
->value
;
2652 string_list_clear(&info
->source_files
, 0);
2655 * In compute_collisions(), we set collisions.strdup_strings to 0
2656 * so that we wouldn't have to make another copy of the new_path
2657 * allocated by apply_dir_rename(). But now that we've used them
2658 * and have no other references to these strings, it is time to
2661 free_strmap_strings(&collisions
);
2662 strmap_clear(&collisions
, 1);
2666 static int detect_and_process_renames(struct merge_options
*opt
,
2667 struct tree
*merge_base
,
2671 struct diff_queue_struct combined
;
2672 struct rename_info
*renames
= &opt
->priv
->renames
;
2673 int need_dir_renames
, s
, clean
= 1;
2675 memset(&combined
, 0, sizeof(combined
));
2676 if (!possible_renames(renames
))
2679 trace2_region_enter("merge", "regular renames", opt
->repo
);
2680 detect_regular_renames(opt
, MERGE_SIDE1
);
2681 detect_regular_renames(opt
, MERGE_SIDE2
);
2682 use_cached_pairs(opt
, &renames
->cached_pairs
[1], &renames
->pairs
[1]);
2683 use_cached_pairs(opt
, &renames
->cached_pairs
[2], &renames
->pairs
[2]);
2684 trace2_region_leave("merge", "regular renames", opt
->repo
);
2686 trace2_region_enter("merge", "directory renames", opt
->repo
);
2688 !opt
->priv
->call_depth
&&
2689 (opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_TRUE
||
2690 opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_CONFLICT
);
2692 if (need_dir_renames
) {
2693 get_provisional_directory_renames(opt
, MERGE_SIDE1
, &clean
);
2694 get_provisional_directory_renames(opt
, MERGE_SIDE2
, &clean
);
2695 handle_directory_level_conflicts(opt
);
2698 ALLOC_GROW(combined
.queue
,
2699 renames
->pairs
[1].nr
+ renames
->pairs
[2].nr
,
2701 clean
&= collect_renames(opt
, &combined
, MERGE_SIDE1
,
2702 &renames
->dir_renames
[2],
2703 &renames
->dir_renames
[1]);
2704 clean
&= collect_renames(opt
, &combined
, MERGE_SIDE2
,
2705 &renames
->dir_renames
[1],
2706 &renames
->dir_renames
[2]);
2707 STABLE_QSORT(combined
.queue
, combined
.nr
, compare_pairs
);
2708 trace2_region_leave("merge", "directory renames", opt
->repo
);
2710 trace2_region_enter("merge", "process renames", opt
->repo
);
2711 clean
&= process_renames(opt
, &combined
);
2712 trace2_region_leave("merge", "process renames", opt
->repo
);
2714 goto simple_cleanup
; /* collect_renames() handles some of cleanup */
2718 * Free now unneeded filepairs, which would have been handled
2719 * in collect_renames() normally but we skipped that code.
2721 for (s
= MERGE_SIDE1
; s
<= MERGE_SIDE2
; s
++) {
2722 struct diff_queue_struct
*side_pairs
;
2725 side_pairs
= &renames
->pairs
[s
];
2726 for (i
= 0; i
< side_pairs
->nr
; ++i
) {
2727 struct diff_filepair
*p
= side_pairs
->queue
[i
];
2728 diff_free_filepair(p
);
2733 /* Free memory for renames->pairs[] and combined */
2734 for (s
= MERGE_SIDE1
; s
<= MERGE_SIDE2
; s
++) {
2735 free(renames
->pairs
[s
].queue
);
2736 DIFF_QUEUE_CLEAR(&renames
->pairs
[s
]);
2740 for (i
= 0; i
< combined
.nr
; i
++)
2741 diff_free_filepair(combined
.queue
[i
]);
2742 free(combined
.queue
);
2748 /*** Function Grouping: functions related to process_entries() ***/
2750 static int string_list_df_name_compare(const char *one
, const char *two
)
2752 int onelen
= strlen(one
);
2753 int twolen
= strlen(two
);
2755 * Here we only care that entries for D/F conflicts are
2756 * adjacent, in particular with the file of the D/F conflict
2757 * appearing before files below the corresponding directory.
2758 * The order of the rest of the list is irrelevant for us.
2760 * To achieve this, we sort with df_name_compare and provide
2761 * the mode S_IFDIR so that D/F conflicts will sort correctly.
2762 * We use the mode S_IFDIR for everything else for simplicity,
2763 * since in other cases any changes in their order due to
2764 * sorting cause no problems for us.
2766 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
2767 two
, twolen
, S_IFDIR
);
2769 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
2770 * that 'foo' comes before 'foo/bar'.
2774 return onelen
- twolen
;
2777 static int read_oid_strbuf(struct merge_options
*opt
,
2778 const struct object_id
*oid
,
2782 enum object_type type
;
2784 buf
= read_object_file(oid
, &type
, &size
);
2786 return err(opt
, _("cannot read object %s"), oid_to_hex(oid
));
2787 if (type
!= OBJ_BLOB
) {
2789 return err(opt
, _("object %s is not a blob"), oid_to_hex(oid
));
2791 strbuf_attach(dst
, buf
, size
, size
+ 1);
2795 static int blob_unchanged(struct merge_options
*opt
,
2796 const struct version_info
*base
,
2797 const struct version_info
*side
,
2800 struct strbuf basebuf
= STRBUF_INIT
;
2801 struct strbuf sidebuf
= STRBUF_INIT
;
2802 int ret
= 0; /* assume changed for safety */
2803 struct index_state
*idx
= &opt
->priv
->attr_index
;
2805 if (!idx
->initialized
)
2806 initialize_attr_index(opt
);
2808 if (base
->mode
!= side
->mode
)
2810 if (oideq(&base
->oid
, &side
->oid
))
2813 if (read_oid_strbuf(opt
, &base
->oid
, &basebuf
) ||
2814 read_oid_strbuf(opt
, &side
->oid
, &sidebuf
))
2817 * Note: binary | is used so that both renormalizations are
2818 * performed. Comparison can be skipped if both files are
2819 * unchanged since their sha1s have already been compared.
2821 if (renormalize_buffer(idx
, path
, basebuf
.buf
, basebuf
.len
, &basebuf
) |
2822 renormalize_buffer(idx
, path
, sidebuf
.buf
, sidebuf
.len
, &sidebuf
))
2823 ret
= (basebuf
.len
== sidebuf
.len
&&
2824 !memcmp(basebuf
.buf
, sidebuf
.buf
, basebuf
.len
));
2827 strbuf_release(&basebuf
);
2828 strbuf_release(&sidebuf
);
2832 struct directory_versions
{
2834 * versions: list of (basename -> version_info)
2836 * The basenames are in reverse lexicographic order of full pathnames,
2837 * as processed in process_entries(). This puts all entries within
2838 * a directory together, and covers the directory itself after
2839 * everything within it, allowing us to write subtrees before needing
2840 * to record information for the tree itself.
2842 struct string_list versions
;
2845 * offsets: list of (full relative path directories -> integer offsets)
2847 * Since versions contains basenames from files in multiple different
2848 * directories, we need to know which entries in versions correspond
2849 * to which directories. Values of e.g.
2853 * Would mean that entries 0-1 of versions are files in the toplevel
2854 * directory, entries 2-4 are files under src/, and the remaining
2855 * entries starting at index 5 are files under src/moduleA/.
2857 struct string_list offsets
;
2860 * last_directory: directory that previously processed file found in
2862 * last_directory starts NULL, but records the directory in which the
2863 * previous file was found within. As soon as
2864 * directory(current_file) != last_directory
2865 * then we need to start updating accounting in versions & offsets.
2866 * Note that last_directory is always the last path in "offsets" (or
2867 * NULL if "offsets" is empty) so this exists just for quick access.
2869 const char *last_directory
;
2871 /* last_directory_len: cached computation of strlen(last_directory) */
2872 unsigned last_directory_len
;
2875 static int tree_entry_order(const void *a_
, const void *b_
)
2877 const struct string_list_item
*a
= a_
;
2878 const struct string_list_item
*b
= b_
;
2880 const struct merged_info
*ami
= a
->util
;
2881 const struct merged_info
*bmi
= b
->util
;
2882 return base_name_compare(a
->string
, strlen(a
->string
), ami
->result
.mode
,
2883 b
->string
, strlen(b
->string
), bmi
->result
.mode
);
2886 static void write_tree(struct object_id
*result_oid
,
2887 struct string_list
*versions
,
2888 unsigned int offset
,
2891 size_t maxlen
= 0, extra
;
2893 struct strbuf buf
= STRBUF_INIT
;
2896 assert(offset
<= versions
->nr
);
2897 nr
= versions
->nr
- offset
;
2899 /* No need for STABLE_QSORT -- filenames must be unique */
2900 QSORT(versions
->items
+ offset
, nr
, tree_entry_order
);
2902 /* Pre-allocate some space in buf */
2903 extra
= hash_size
+ 8; /* 8: 6 for mode, 1 for space, 1 for NUL char */
2904 for (i
= 0; i
< nr
; i
++) {
2905 maxlen
+= strlen(versions
->items
[offset
+i
].string
) + extra
;
2907 strbuf_grow(&buf
, maxlen
);
2909 /* Write each entry out to buf */
2910 for (i
= 0; i
< nr
; i
++) {
2911 struct merged_info
*mi
= versions
->items
[offset
+i
].util
;
2912 struct version_info
*ri
= &mi
->result
;
2913 strbuf_addf(&buf
, "%o %s%c",
2915 versions
->items
[offset
+i
].string
, '\0');
2916 strbuf_add(&buf
, ri
->oid
.hash
, hash_size
);
2919 /* Write this object file out, and record in result_oid */
2920 write_object_file(buf
.buf
, buf
.len
, tree_type
, result_oid
);
2921 strbuf_release(&buf
);
2924 static void record_entry_for_tree(struct directory_versions
*dir_metadata
,
2926 struct merged_info
*mi
)
2928 const char *basename
;
2931 /* nothing to record */
2934 basename
= path
+ mi
->basename_offset
;
2935 assert(strchr(basename
, '/') == NULL
);
2936 string_list_append(&dir_metadata
->versions
,
2937 basename
)->util
= &mi
->result
;
2940 static void write_completed_directory(struct merge_options
*opt
,
2941 const char *new_directory_name
,
2942 struct directory_versions
*info
)
2944 const char *prev_dir
;
2945 struct merged_info
*dir_info
= NULL
;
2946 unsigned int offset
;
2949 * Some explanation of info->versions and info->offsets...
2951 * process_entries() iterates over all relevant files AND
2952 * directories in reverse lexicographic order, and calls this
2953 * function. Thus, an example of the paths that process_entries()
2954 * could operate on (along with the directories for those paths
2959 * src/moduleB/umm.c src/moduleB
2960 * src/moduleB/stuff.h src/moduleB
2961 * src/moduleB/baz.c src/moduleB
2963 * src/moduleA/foo.c src/moduleA
2964 * src/moduleA/bar.c src/moduleA
2971 * always contains the unprocessed entries and their
2972 * version_info information. For example, after the first five
2973 * entries above, info->versions would be:
2975 * xtract.c <xtract.c's version_info>
2976 * token.txt <token.txt's version_info>
2977 * umm.c <src/moduleB/umm.c's version_info>
2978 * stuff.h <src/moduleB/stuff.h's version_info>
2979 * baz.c <src/moduleB/baz.c's version_info>
2981 * Once a subdirectory is completed we remove the entries in
2982 * that subdirectory from info->versions, writing it as a tree
2983 * (write_tree()). Thus, as soon as we get to src/moduleB,
2984 * info->versions would be updated to
2986 * xtract.c <xtract.c's version_info>
2987 * token.txt <token.txt's version_info>
2988 * moduleB <src/moduleB's version_info>
2992 * helps us track which entries in info->versions correspond to
2993 * which directories. When we are N directories deep (e.g. 4
2994 * for src/modA/submod/subdir/), we have up to N+1 unprocessed
2995 * directories (+1 because of toplevel dir). Corresponding to
2996 * the info->versions example above, after processing five entries
2997 * info->offsets will be:
3002 * which is used to know that xtract.c & token.txt are from the
3003 * toplevel dirctory, while umm.c & stuff.h & baz.c are from the
3004 * src/moduleB directory. Again, following the example above,
3005 * once we need to process src/moduleB, then info->offsets is
3011 * which says that moduleB (and only moduleB so far) is in the
3014 * One unique thing to note about info->offsets here is that
3015 * "src" was not added to info->offsets until there was a path
3016 * (a file OR directory) immediately below src/ that got
3019 * Since process_entry() just appends new entries to info->versions,
3020 * write_completed_directory() only needs to do work if the next path
3021 * is in a directory that is different than the last directory found
3026 * If we are working with the same directory as the last entry, there
3027 * is no work to do. (See comments above the directory_name member of
3028 * struct merged_info for why we can use pointer comparison instead of
3031 if (new_directory_name
== info
->last_directory
)
3035 * If we are just starting (last_directory is NULL), or last_directory
3036 * is a prefix of the current directory, then we can just update
3037 * info->offsets to record the offset where we started this directory
3038 * and update last_directory to have quick access to it.
3040 if (info
->last_directory
== NULL
||
3041 !strncmp(new_directory_name
, info
->last_directory
,
3042 info
->last_directory_len
)) {
3043 uintptr_t offset
= info
->versions
.nr
;
3045 info
->last_directory
= new_directory_name
;
3046 info
->last_directory_len
= strlen(info
->last_directory
);
3048 * Record the offset into info->versions where we will
3049 * start recording basenames of paths found within
3050 * new_directory_name.
3052 string_list_append(&info
->offsets
,
3053 info
->last_directory
)->util
= (void*)offset
;
3058 * The next entry that will be processed will be within
3059 * new_directory_name. Since at this point we know that
3060 * new_directory_name is within a different directory than
3061 * info->last_directory, we have all entries for info->last_directory
3062 * in info->versions and we need to create a tree object for them.
3064 dir_info
= strmap_get(&opt
->priv
->paths
, info
->last_directory
);
3066 offset
= (uintptr_t)info
->offsets
.items
[info
->offsets
.nr
-1].util
;
3067 if (offset
== info
->versions
.nr
) {
3069 * Actually, we don't need to create a tree object in this
3070 * case. Whenever all files within a directory disappear
3071 * during the merge (e.g. unmodified on one side and
3072 * deleted on the other, or files were renamed elsewhere),
3073 * then we get here and the directory itself needs to be
3074 * omitted from its parent tree as well.
3076 dir_info
->is_null
= 1;
3079 * Write out the tree to the git object directory, and also
3080 * record the mode and oid in dir_info->result.
3082 dir_info
->is_null
= 0;
3083 dir_info
->result
.mode
= S_IFDIR
;
3084 write_tree(&dir_info
->result
.oid
, &info
->versions
, offset
,
3085 opt
->repo
->hash_algo
->rawsz
);
3089 * We've now used several entries from info->versions and one entry
3090 * from info->offsets, so we get rid of those values.
3093 info
->versions
.nr
= offset
;
3096 * Now we've taken care of the completed directory, but we need to
3097 * prepare things since future entries will be in
3098 * new_directory_name. (In particular, process_entry() will be
3099 * appending new entries to info->versions.) So, we need to make
3100 * sure new_directory_name is the last entry in info->offsets.
3102 prev_dir
= info
->offsets
.nr
== 0 ? NULL
:
3103 info
->offsets
.items
[info
->offsets
.nr
-1].string
;
3104 if (new_directory_name
!= prev_dir
) {
3105 uintptr_t c
= info
->versions
.nr
;
3106 string_list_append(&info
->offsets
,
3107 new_directory_name
)->util
= (void*)c
;
3110 /* And, of course, we need to update last_directory to match. */
3111 info
->last_directory
= new_directory_name
;
3112 info
->last_directory_len
= strlen(info
->last_directory
);
3115 /* Per entry merge function */
3116 static void process_entry(struct merge_options
*opt
,
3118 struct conflict_info
*ci
,
3119 struct directory_versions
*dir_metadata
)
3121 int df_file_index
= 0;
3124 assert(ci
->filemask
>= 0 && ci
->filemask
<= 7);
3125 /* ci->match_mask == 7 was handled in collect_merge_info_callback() */
3126 assert(ci
->match_mask
== 0 || ci
->match_mask
== 3 ||
3127 ci
->match_mask
== 5 || ci
->match_mask
== 6);
3130 record_entry_for_tree(dir_metadata
, path
, &ci
->merged
);
3131 if (ci
->filemask
== 0)
3132 /* nothing else to handle */
3134 assert(ci
->df_conflict
);
3137 if (ci
->df_conflict
&& ci
->merged
.result
.mode
== 0) {
3141 * directory no longer in the way, but we do have a file we
3142 * need to place here so we need to clean away the "directory
3143 * merges to nothing" result.
3145 ci
->df_conflict
= 0;
3146 assert(ci
->filemask
!= 0);
3147 ci
->merged
.clean
= 0;
3148 ci
->merged
.is_null
= 0;
3149 /* and we want to zero out any directory-related entries */
3150 ci
->match_mask
= (ci
->match_mask
& ~ci
->dirmask
);
3152 for (i
= MERGE_BASE
; i
<= MERGE_SIDE2
; i
++) {
3153 if (ci
->filemask
& (1 << i
))
3155 ci
->stages
[i
].mode
= 0;
3156 oidcpy(&ci
->stages
[i
].oid
, null_oid());
3158 } else if (ci
->df_conflict
&& ci
->merged
.result
.mode
!= 0) {
3160 * This started out as a D/F conflict, and the entries in
3161 * the competing directory were not removed by the merge as
3162 * evidenced by write_completed_directory() writing a value
3163 * to ci->merged.result.mode.
3165 struct conflict_info
*new_ci
;
3167 const char *old_path
= path
;
3170 assert(ci
->merged
.result
.mode
== S_IFDIR
);
3173 * If filemask is 1, we can just ignore the file as having
3174 * been deleted on both sides. We do not want to overwrite
3175 * ci->merged.result, since it stores the tree for all the
3178 if (ci
->filemask
== 1) {
3184 * This file still exists on at least one side, and we want
3185 * the directory to remain here, so we need to move this
3186 * path to some new location.
3188 CALLOC_ARRAY(new_ci
, 1);
3189 /* We don't really want new_ci->merged.result copied, but it'll
3190 * be overwritten below so it doesn't matter. We also don't
3191 * want any directory mode/oid values copied, but we'll zero
3192 * those out immediately. We do want the rest of ci copied.
3194 memcpy(new_ci
, ci
, sizeof(*ci
));
3195 new_ci
->match_mask
= (new_ci
->match_mask
& ~new_ci
->dirmask
);
3196 new_ci
->dirmask
= 0;
3197 for (i
= MERGE_BASE
; i
<= MERGE_SIDE2
; i
++) {
3198 if (new_ci
->filemask
& (1 << i
))
3200 /* zero out any entries related to directories */
3201 new_ci
->stages
[i
].mode
= 0;
3202 oidcpy(&new_ci
->stages
[i
].oid
, null_oid());
3206 * Find out which side this file came from; note that we
3207 * cannot just use ci->filemask, because renames could cause
3208 * the filemask to go back to 7. So we use dirmask, then
3209 * pick the opposite side's index.
3211 df_file_index
= (ci
->dirmask
& (1 << 1)) ? 2 : 1;
3212 branch
= (df_file_index
== 1) ? opt
->branch1
: opt
->branch2
;
3213 path
= unique_path(&opt
->priv
->paths
, path
, branch
);
3214 strmap_put(&opt
->priv
->paths
, path
, new_ci
);
3216 path_msg(opt
, path
, 0,
3217 _("CONFLICT (file/directory): directory in the way "
3218 "of %s from %s; moving it to %s instead."),
3219 old_path
, branch
, path
);
3222 * Zero out the filemask for the old ci. At this point, ci
3223 * was just an entry for a directory, so we don't need to
3224 * do anything more with it.
3229 * Now note that we're working on the new entry (path was
3236 * NOTE: Below there is a long switch-like if-elseif-elseif... block
3237 * which the code goes through even for the df_conflict cases
3240 if (ci
->match_mask
) {
3241 ci
->merged
.clean
= 1;
3242 if (ci
->match_mask
== 6) {
3243 /* stages[1] == stages[2] */
3244 ci
->merged
.result
.mode
= ci
->stages
[1].mode
;
3245 oidcpy(&ci
->merged
.result
.oid
, &ci
->stages
[1].oid
);
3247 /* determine the mask of the side that didn't match */
3248 unsigned int othermask
= 7 & ~ci
->match_mask
;
3249 int side
= (othermask
== 4) ? 2 : 1;
3251 ci
->merged
.result
.mode
= ci
->stages
[side
].mode
;
3252 ci
->merged
.is_null
= !ci
->merged
.result
.mode
;
3253 oidcpy(&ci
->merged
.result
.oid
, &ci
->stages
[side
].oid
);
3255 assert(othermask
== 2 || othermask
== 4);
3256 assert(ci
->merged
.is_null
==
3257 (ci
->filemask
== ci
->match_mask
));
3259 } else if (ci
->filemask
>= 6 &&
3260 (S_IFMT
& ci
->stages
[1].mode
) !=
3261 (S_IFMT
& ci
->stages
[2].mode
)) {
3262 /* Two different items from (file/submodule/symlink) */
3263 if (opt
->priv
->call_depth
) {
3264 /* Just use the version from the merge base */
3265 ci
->merged
.clean
= 0;
3266 oidcpy(&ci
->merged
.result
.oid
, &ci
->stages
[0].oid
);
3267 ci
->merged
.result
.mode
= ci
->stages
[0].mode
;
3268 ci
->merged
.is_null
= (ci
->merged
.result
.mode
== 0);
3270 /* Handle by renaming one or both to separate paths. */
3271 unsigned o_mode
= ci
->stages
[0].mode
;
3272 unsigned a_mode
= ci
->stages
[1].mode
;
3273 unsigned b_mode
= ci
->stages
[2].mode
;
3274 struct conflict_info
*new_ci
;
3275 const char *a_path
= NULL
, *b_path
= NULL
;
3276 int rename_a
= 0, rename_b
= 0;
3278 new_ci
= xmalloc(sizeof(*new_ci
));
3280 if (S_ISREG(a_mode
))
3282 else if (S_ISREG(b_mode
))
3289 if (rename_a
&& rename_b
) {
3290 path_msg(opt
, path
, 0,
3291 _("CONFLICT (distinct types): %s had "
3292 "different types on each side; "
3293 "renamed both of them so each can "
3294 "be recorded somewhere."),
3297 path_msg(opt
, path
, 0,
3298 _("CONFLICT (distinct types): %s had "
3299 "different types on each side; "
3300 "renamed one of them so each can be "
3301 "recorded somewhere."),
3305 ci
->merged
.clean
= 0;
3306 memcpy(new_ci
, ci
, sizeof(*new_ci
));
3308 /* Put b into new_ci, removing a from stages */
3309 new_ci
->merged
.result
.mode
= ci
->stages
[2].mode
;
3310 oidcpy(&new_ci
->merged
.result
.oid
, &ci
->stages
[2].oid
);
3311 new_ci
->stages
[1].mode
= 0;
3312 oidcpy(&new_ci
->stages
[1].oid
, null_oid());
3313 new_ci
->filemask
= 5;
3314 if ((S_IFMT
& b_mode
) != (S_IFMT
& o_mode
)) {
3315 new_ci
->stages
[0].mode
= 0;
3316 oidcpy(&new_ci
->stages
[0].oid
, null_oid());
3317 new_ci
->filemask
= 4;
3320 /* Leave only a in ci, fixing stages. */
3321 ci
->merged
.result
.mode
= ci
->stages
[1].mode
;
3322 oidcpy(&ci
->merged
.result
.oid
, &ci
->stages
[1].oid
);
3323 ci
->stages
[2].mode
= 0;
3324 oidcpy(&ci
->stages
[2].oid
, null_oid());
3326 if ((S_IFMT
& a_mode
) != (S_IFMT
& o_mode
)) {
3327 ci
->stages
[0].mode
= 0;
3328 oidcpy(&ci
->stages
[0].oid
, null_oid());
3332 /* Insert entries into opt->priv_paths */
3333 assert(rename_a
|| rename_b
);
3335 a_path
= unique_path(&opt
->priv
->paths
,
3336 path
, opt
->branch1
);
3337 strmap_put(&opt
->priv
->paths
, a_path
, ci
);
3341 b_path
= unique_path(&opt
->priv
->paths
,
3342 path
, opt
->branch2
);
3345 strmap_put(&opt
->priv
->paths
, b_path
, new_ci
);
3347 if (rename_a
&& rename_b
) {
3348 strmap_remove(&opt
->priv
->paths
, path
, 0);
3350 * We removed path from opt->priv->paths. path
3351 * will also eventually need to be freed, but
3352 * it may still be used by e.g. ci->pathnames.
3353 * So, store it in another string-list for now.
3355 string_list_append(&opt
->priv
->paths_to_free
,
3360 * Do special handling for b_path since process_entry()
3361 * won't be called on it specially.
3363 strmap_put(&opt
->priv
->conflicted
, b_path
, new_ci
);
3364 record_entry_for_tree(dir_metadata
, b_path
,
3368 * Remaining code for processing this entry should
3369 * think in terms of processing a_path.
3374 } else if (ci
->filemask
>= 6) {
3375 /* Need a two-way or three-way content merge */
3376 struct version_info merged_file
;
3377 unsigned clean_merge
;
3378 struct version_info
*o
= &ci
->stages
[0];
3379 struct version_info
*a
= &ci
->stages
[1];
3380 struct version_info
*b
= &ci
->stages
[2];
3382 clean_merge
= handle_content_merge(opt
, path
, o
, a
, b
,
3384 opt
->priv
->call_depth
* 2,
3386 ci
->merged
.clean
= clean_merge
&&
3387 !ci
->df_conflict
&& !ci
->path_conflict
;
3388 ci
->merged
.result
.mode
= merged_file
.mode
;
3389 ci
->merged
.is_null
= (merged_file
.mode
== 0);
3390 oidcpy(&ci
->merged
.result
.oid
, &merged_file
.oid
);
3391 if (clean_merge
&& ci
->df_conflict
) {
3392 assert(df_file_index
== 1 || df_file_index
== 2);
3393 ci
->filemask
= 1 << df_file_index
;
3394 ci
->stages
[df_file_index
].mode
= merged_file
.mode
;
3395 oidcpy(&ci
->stages
[df_file_index
].oid
, &merged_file
.oid
);
3398 const char *reason
= _("content");
3399 if (ci
->filemask
== 6)
3400 reason
= _("add/add");
3401 if (S_ISGITLINK(merged_file
.mode
))
3402 reason
= _("submodule");
3403 path_msg(opt
, path
, 0,
3404 _("CONFLICT (%s): Merge conflict in %s"),
3407 } else if (ci
->filemask
== 3 || ci
->filemask
== 5) {
3409 const char *modify_branch
, *delete_branch
;
3410 int side
= (ci
->filemask
== 5) ? 2 : 1;
3411 int index
= opt
->priv
->call_depth
? 0 : side
;
3413 ci
->merged
.result
.mode
= ci
->stages
[index
].mode
;
3414 oidcpy(&ci
->merged
.result
.oid
, &ci
->stages
[index
].oid
);
3415 ci
->merged
.clean
= 0;
3417 modify_branch
= (side
== 1) ? opt
->branch1
: opt
->branch2
;
3418 delete_branch
= (side
== 1) ? opt
->branch2
: opt
->branch1
;
3420 if (opt
->renormalize
&&
3421 blob_unchanged(opt
, &ci
->stages
[0], &ci
->stages
[side
],
3423 ci
->merged
.is_null
= 1;
3424 ci
->merged
.clean
= 1;
3425 } else if (ci
->path_conflict
&&
3426 oideq(&ci
->stages
[0].oid
, &ci
->stages
[side
].oid
)) {
3428 * This came from a rename/delete; no action to take,
3429 * but avoid printing "modify/delete" conflict notice
3430 * since the contents were not modified.
3433 path_msg(opt
, path
, 0,
3434 _("CONFLICT (modify/delete): %s deleted in %s "
3435 "and modified in %s. Version %s of %s left "
3437 path
, delete_branch
, modify_branch
,
3438 modify_branch
, path
);
3440 } else if (ci
->filemask
== 2 || ci
->filemask
== 4) {
3441 /* Added on one side */
3442 int side
= (ci
->filemask
== 4) ? 2 : 1;
3443 ci
->merged
.result
.mode
= ci
->stages
[side
].mode
;
3444 oidcpy(&ci
->merged
.result
.oid
, &ci
->stages
[side
].oid
);
3445 ci
->merged
.clean
= !ci
->df_conflict
&& !ci
->path_conflict
;
3446 } else if (ci
->filemask
== 1) {
3447 /* Deleted on both sides */
3448 ci
->merged
.is_null
= 1;
3449 ci
->merged
.result
.mode
= 0;
3450 oidcpy(&ci
->merged
.result
.oid
, null_oid());
3451 ci
->merged
.clean
= !ci
->path_conflict
;
3455 * If still conflicted, record it separately. This allows us to later
3456 * iterate over just conflicted entries when updating the index instead
3457 * of iterating over all entries.
3459 if (!ci
->merged
.clean
)
3460 strmap_put(&opt
->priv
->conflicted
, path
, ci
);
3461 record_entry_for_tree(dir_metadata
, path
, &ci
->merged
);
3464 static void prefetch_for_content_merges(struct merge_options
*opt
,
3465 struct string_list
*plist
)
3467 struct string_list_item
*e
;
3468 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3470 if (opt
->repo
!= the_repository
|| !has_promisor_remote())
3473 for (e
= &plist
->items
[plist
->nr
-1]; e
>= plist
->items
; --e
) {
3474 /* char *path = e->string; */
3475 struct conflict_info
*ci
= e
->util
;
3478 /* Ignore clean entries */
3479 if (ci
->merged
.clean
)
3482 /* Ignore entries that don't need a content merge */
3483 if (ci
->match_mask
|| ci
->filemask
< 6 ||
3484 !S_ISREG(ci
->stages
[1].mode
) ||
3485 !S_ISREG(ci
->stages
[2].mode
) ||
3486 oideq(&ci
->stages
[1].oid
, &ci
->stages
[2].oid
))
3489 /* Also don't need content merge if base matches either side */
3490 if (ci
->filemask
== 7 &&
3491 S_ISREG(ci
->stages
[0].mode
) &&
3492 (oideq(&ci
->stages
[0].oid
, &ci
->stages
[1].oid
) ||
3493 oideq(&ci
->stages
[0].oid
, &ci
->stages
[2].oid
)))
3496 for (i
= 0; i
< 3; i
++) {
3497 unsigned side_mask
= (1 << i
);
3498 struct version_info
*vi
= &ci
->stages
[i
];
3500 if ((ci
->filemask
& side_mask
) &&
3501 S_ISREG(vi
->mode
) &&
3502 oid_object_info_extended(opt
->repo
, &vi
->oid
, NULL
,
3503 OBJECT_INFO_FOR_PREFETCH
))
3504 oid_array_append(&to_fetch
, &vi
->oid
);
3508 promisor_remote_get_direct(opt
->repo
, to_fetch
.oid
, to_fetch
.nr
);
3509 oid_array_clear(&to_fetch
);
3512 static void process_entries(struct merge_options
*opt
,
3513 struct object_id
*result_oid
)
3515 struct hashmap_iter iter
;
3516 struct strmap_entry
*e
;
3517 struct string_list plist
= STRING_LIST_INIT_NODUP
;
3518 struct string_list_item
*entry
;
3519 struct directory_versions dir_metadata
= { STRING_LIST_INIT_NODUP
,
3520 STRING_LIST_INIT_NODUP
,
3523 trace2_region_enter("merge", "process_entries setup", opt
->repo
);
3524 if (strmap_empty(&opt
->priv
->paths
)) {
3525 oidcpy(result_oid
, opt
->repo
->hash_algo
->empty_tree
);
3529 /* Hack to pre-allocate plist to the desired size */
3530 trace2_region_enter("merge", "plist grow", opt
->repo
);
3531 ALLOC_GROW(plist
.items
, strmap_get_size(&opt
->priv
->paths
), plist
.alloc
);
3532 trace2_region_leave("merge", "plist grow", opt
->repo
);
3534 /* Put every entry from paths into plist, then sort */
3535 trace2_region_enter("merge", "plist copy", opt
->repo
);
3536 strmap_for_each_entry(&opt
->priv
->paths
, &iter
, e
) {
3537 string_list_append(&plist
, e
->key
)->util
= e
->value
;
3539 trace2_region_leave("merge", "plist copy", opt
->repo
);
3541 trace2_region_enter("merge", "plist special sort", opt
->repo
);
3542 plist
.cmp
= string_list_df_name_compare
;
3543 string_list_sort(&plist
);
3544 trace2_region_leave("merge", "plist special sort", opt
->repo
);
3546 trace2_region_leave("merge", "process_entries setup", opt
->repo
);
3549 * Iterate over the items in reverse order, so we can handle paths
3550 * below a directory before needing to handle the directory itself.
3552 * This allows us to write subtrees before we need to write trees,
3553 * and it also enables sane handling of directory/file conflicts
3554 * (because it allows us to know whether the directory is still in
3555 * the way when it is time to process the file at the same path).
3557 trace2_region_enter("merge", "processing", opt
->repo
);
3558 prefetch_for_content_merges(opt
, &plist
);
3559 for (entry
= &plist
.items
[plist
.nr
-1]; entry
>= plist
.items
; --entry
) {
3560 char *path
= entry
->string
;
3562 * NOTE: mi may actually be a pointer to a conflict_info, but
3563 * we have to check mi->clean first to see if it's safe to
3564 * reassign to such a pointer type.
3566 struct merged_info
*mi
= entry
->util
;
3568 write_completed_directory(opt
, mi
->directory_name
,
3571 record_entry_for_tree(&dir_metadata
, path
, mi
);
3573 struct conflict_info
*ci
= (struct conflict_info
*)mi
;
3574 process_entry(opt
, path
, ci
, &dir_metadata
);
3577 trace2_region_leave("merge", "processing", opt
->repo
);
3579 trace2_region_enter("merge", "process_entries cleanup", opt
->repo
);
3580 if (dir_metadata
.offsets
.nr
!= 1 ||
3581 (uintptr_t)dir_metadata
.offsets
.items
[0].util
!= 0) {
3582 printf("dir_metadata.offsets.nr = %d (should be 1)\n",
3583 dir_metadata
.offsets
.nr
);
3584 printf("dir_metadata.offsets.items[0].util = %u (should be 0)\n",
3585 (unsigned)(uintptr_t)dir_metadata
.offsets
.items
[0].util
);
3587 BUG("dir_metadata accounting completely off; shouldn't happen");
3589 write_tree(result_oid
, &dir_metadata
.versions
, 0,
3590 opt
->repo
->hash_algo
->rawsz
);
3591 string_list_clear(&plist
, 0);
3592 string_list_clear(&dir_metadata
.versions
, 0);
3593 string_list_clear(&dir_metadata
.offsets
, 0);
3594 trace2_region_leave("merge", "process_entries cleanup", opt
->repo
);
3597 /*** Function Grouping: functions related to merge_switch_to_result() ***/
3599 static int checkout(struct merge_options
*opt
,
3603 /* Switch the index/working copy from old to new */
3605 struct tree_desc trees
[2];
3606 struct unpack_trees_options unpack_opts
;
3608 memset(&unpack_opts
, 0, sizeof(unpack_opts
));
3609 unpack_opts
.head_idx
= -1;
3610 unpack_opts
.src_index
= opt
->repo
->index
;
3611 unpack_opts
.dst_index
= opt
->repo
->index
;
3613 setup_unpack_trees_porcelain(&unpack_opts
, "merge");
3616 * NOTE: if this were just "git checkout" code, we would probably
3617 * read or refresh the cache and check for a conflicted index, but
3618 * builtin/merge.c or sequencer.c really needs to read the index
3619 * and check for conflicted entries before starting merging for a
3620 * good user experience (no sense waiting for merges/rebases before
3621 * erroring out), so there's no reason to duplicate that work here.
3624 /* 2-way merge to the new branch */
3625 unpack_opts
.update
= 1;
3626 unpack_opts
.merge
= 1;
3627 unpack_opts
.quiet
= 0; /* FIXME: sequencer might want quiet? */
3628 unpack_opts
.verbose_update
= (opt
->verbosity
> 2);
3629 unpack_opts
.fn
= twoway_merge
;
3630 if (1/* FIXME: opts->overwrite_ignore*/) {
3631 CALLOC_ARRAY(unpack_opts
.dir
, 1);
3632 unpack_opts
.dir
->flags
|= DIR_SHOW_IGNORED
;
3633 setup_standard_excludes(unpack_opts
.dir
);
3636 init_tree_desc(&trees
[0], prev
->buffer
, prev
->size
);
3638 init_tree_desc(&trees
[1], next
->buffer
, next
->size
);
3640 ret
= unpack_trees(2, trees
, &unpack_opts
);
3641 clear_unpack_trees_porcelain(&unpack_opts
);
3642 dir_clear(unpack_opts
.dir
);
3643 FREE_AND_NULL(unpack_opts
.dir
);
3647 static int record_conflicted_index_entries(struct merge_options
*opt
)
3649 struct hashmap_iter iter
;
3650 struct strmap_entry
*e
;
3651 struct index_state
*index
= opt
->repo
->index
;
3652 struct checkout state
= CHECKOUT_INIT
;
3654 int original_cache_nr
;
3656 if (strmap_empty(&opt
->priv
->conflicted
))
3659 /* If any entries have skip_worktree set, we'll have to check 'em out */
3662 state
.refresh_cache
= 1;
3663 state
.istate
= index
;
3664 original_cache_nr
= index
->cache_nr
;
3666 /* Put every entry from paths into plist, then sort */
3667 strmap_for_each_entry(&opt
->priv
->conflicted
, &iter
, e
) {
3668 const char *path
= e
->key
;
3669 struct conflict_info
*ci
= e
->value
;
3671 struct cache_entry
*ce
;
3677 * The index will already have a stage=0 entry for this path,
3678 * because we created an as-merged-as-possible version of the
3679 * file and checkout() moved the working copy and index over
3682 * However, previous iterations through this loop will have
3683 * added unstaged entries to the end of the cache which
3684 * ignore the standard alphabetical ordering of cache
3685 * entries and break invariants needed for index_name_pos()
3686 * to work. However, we know the entry we want is before
3687 * those appended cache entries, so do a temporary swap on
3688 * cache_nr to only look through entries of interest.
3690 SWAP(index
->cache_nr
, original_cache_nr
);
3691 pos
= index_name_pos(index
, path
, strlen(path
));
3692 SWAP(index
->cache_nr
, original_cache_nr
);
3694 if (ci
->filemask
!= 1)
3695 BUG("Conflicted %s but nothing in basic working tree or index; this shouldn't happen", path
);
3696 cache_tree_invalidate_path(index
, path
);
3698 ce
= index
->cache
[pos
];
3701 * Clean paths with CE_SKIP_WORKTREE set will not be
3702 * written to the working tree by the unpack_trees()
3703 * call in checkout(). Our conflicted entries would
3704 * have appeared clean to that code since we ignored
3705 * the higher order stages. Thus, we need override
3706 * the CE_SKIP_WORKTREE bit and manually write those
3707 * files to the working disk here.
3709 if (ce_skip_worktree(ce
)) {
3712 if (!lstat(path
, &st
)) {
3713 char *new_name
= unique_path(&opt
->priv
->paths
,
3717 path_msg(opt
, path
, 1,
3718 _("Note: %s not up to date and in way of checking out conflicted version; old copy renamed to %s"),
3720 errs
|= rename(path
, new_name
);
3723 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
3727 * Mark this cache entry for removal and instead add
3728 * new stage>0 entries corresponding to the
3729 * conflicts. If there are many conflicted entries, we
3730 * want to avoid memmove'ing O(NM) entries by
3731 * inserting the new entries one at a time. So,
3732 * instead, we just add the new cache entries to the
3733 * end (ignoring normal index requirements on sort
3734 * order) and sort the index once we're all done.
3736 ce
->ce_flags
|= CE_REMOVE
;
3739 for (i
= MERGE_BASE
; i
<= MERGE_SIDE2
; i
++) {
3740 struct version_info
*vi
;
3741 if (!(ci
->filemask
& (1ul << i
)))
3743 vi
= &ci
->stages
[i
];
3744 ce
= make_cache_entry(index
, vi
->mode
, &vi
->oid
,
3746 add_index_entry(index
, ce
, ADD_CACHE_JUST_APPEND
);
3751 * Remove the unused cache entries (and invalidate the relevant
3752 * cache-trees), then sort the index entries to get the conflicted
3753 * entries we added to the end into their right locations.
3755 remove_marked_cache_entries(index
, 1);
3757 * No need for STABLE_QSORT -- cmp_cache_name_compare sorts primarily
3758 * on filename and secondarily on stage, and (name, stage #) are a
3761 QSORT(index
->cache
, index
->cache_nr
, cmp_cache_name_compare
);
3766 void merge_switch_to_result(struct merge_options
*opt
,
3768 struct merge_result
*result
,
3769 int update_worktree_and_index
,
3770 int display_update_msgs
)
3772 assert(opt
->priv
== NULL
);
3773 if (result
->clean
>= 0 && update_worktree_and_index
) {
3774 const char *filename
;
3777 trace2_region_enter("merge", "checkout", opt
->repo
);
3778 if (checkout(opt
, head
, result
->tree
)) {
3779 /* failure to function */
3783 trace2_region_leave("merge", "checkout", opt
->repo
);
3785 trace2_region_enter("merge", "record_conflicted", opt
->repo
);
3786 opt
->priv
= result
->priv
;
3787 if (record_conflicted_index_entries(opt
)) {
3788 /* failure to function */
3794 trace2_region_leave("merge", "record_conflicted", opt
->repo
);
3796 trace2_region_enter("merge", "write_auto_merge", opt
->repo
);
3797 filename
= git_path_auto_merge(opt
->repo
);
3798 fp
= xfopen(filename
, "w");
3799 fprintf(fp
, "%s\n", oid_to_hex(&result
->tree
->object
.oid
));
3801 trace2_region_leave("merge", "write_auto_merge", opt
->repo
);
3804 if (display_update_msgs
) {
3805 struct merge_options_internal
*opti
= result
->priv
;
3806 struct hashmap_iter iter
;
3807 struct strmap_entry
*e
;
3808 struct string_list olist
= STRING_LIST_INIT_NODUP
;
3811 trace2_region_enter("merge", "display messages", opt
->repo
);
3813 /* Hack to pre-allocate olist to the desired size */
3814 ALLOC_GROW(olist
.items
, strmap_get_size(&opti
->output
),
3817 /* Put every entry from output into olist, then sort */
3818 strmap_for_each_entry(&opti
->output
, &iter
, e
) {
3819 string_list_append(&olist
, e
->key
)->util
= e
->value
;
3821 string_list_sort(&olist
);
3823 /* Iterate over the items, printing them */
3824 for (i
= 0; i
< olist
.nr
; ++i
) {
3825 struct strbuf
*sb
= olist
.items
[i
].util
;
3827 printf("%s", sb
->buf
);
3829 string_list_clear(&olist
, 0);
3831 /* Also include needed rename limit adjustment now */
3832 diff_warn_rename_limit("merge.renamelimit",
3833 opti
->renames
.needed_limit
, 0);
3835 trace2_region_leave("merge", "display messages", opt
->repo
);
3838 merge_finalize(opt
, result
);
3841 void merge_finalize(struct merge_options
*opt
,
3842 struct merge_result
*result
)
3844 struct merge_options_internal
*opti
= result
->priv
;
3846 if (opt
->renormalize
)
3847 git_attr_set_direction(GIT_ATTR_CHECKIN
);
3848 assert(opt
->priv
== NULL
);
3850 clear_or_reinit_internal_opts(opti
, 0);
3851 FREE_AND_NULL(opti
);
3854 /*** Function Grouping: helper functions for merge_incore_*() ***/
3856 static struct tree
*shift_tree_object(struct repository
*repo
,
3857 struct tree
*one
, struct tree
*two
,
3858 const char *subtree_shift
)
3860 struct object_id shifted
;
3862 if (!*subtree_shift
) {
3863 shift_tree(repo
, &one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
3865 shift_tree_by(repo
, &one
->object
.oid
, &two
->object
.oid
, &shifted
,
3868 if (oideq(&two
->object
.oid
, &shifted
))
3870 return lookup_tree(repo
, &shifted
);
3873 static inline void set_commit_tree(struct commit
*c
, struct tree
*t
)
3878 static struct commit
*make_virtual_commit(struct repository
*repo
,
3880 const char *comment
)
3882 struct commit
*commit
= alloc_commit_node(repo
);
3884 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
3885 set_commit_tree(commit
, tree
);
3886 commit
->object
.parsed
= 1;
3890 static void merge_start(struct merge_options
*opt
, struct merge_result
*result
)
3892 struct rename_info
*renames
;
3895 /* Sanity checks on opt */
3896 trace2_region_enter("merge", "sanity checks", opt
->repo
);
3899 assert(opt
->branch1
&& opt
->branch2
);
3901 assert(opt
->detect_directory_renames
>= MERGE_DIRECTORY_RENAMES_NONE
&&
3902 opt
->detect_directory_renames
<= MERGE_DIRECTORY_RENAMES_TRUE
);
3903 assert(opt
->rename_limit
>= -1);
3904 assert(opt
->rename_score
>= 0 && opt
->rename_score
<= MAX_SCORE
);
3905 assert(opt
->show_rename_progress
>= 0 && opt
->show_rename_progress
<= 1);
3907 assert(opt
->xdl_opts
>= 0);
3908 assert(opt
->recursive_variant
>= MERGE_VARIANT_NORMAL
&&
3909 opt
->recursive_variant
<= MERGE_VARIANT_THEIRS
);
3912 * detect_renames, verbosity, buffer_output, and obuf are ignored
3913 * fields that were used by "recursive" rather than "ort" -- but
3914 * sanity check them anyway.
3916 assert(opt
->detect_renames
>= -1 &&
3917 opt
->detect_renames
<= DIFF_DETECT_COPY
);
3918 assert(opt
->verbosity
>= 0 && opt
->verbosity
<= 5);
3919 assert(opt
->buffer_output
<= 2);
3920 assert(opt
->obuf
.len
== 0);
3922 assert(opt
->priv
== NULL
);
3923 if (result
->_properly_initialized
!= 0 &&
3924 result
->_properly_initialized
!= RESULT_INITIALIZED
)
3925 BUG("struct merge_result passed to merge_incore_*recursive() must be zeroed or filled with values from a previous run");
3926 assert(!!result
->priv
== !!result
->_properly_initialized
);
3928 opt
->priv
= result
->priv
;
3929 result
->priv
= NULL
;
3931 * opt->priv non-NULL means we had results from a previous
3932 * run; do a few sanity checks that user didn't mess with
3933 * it in an obvious fashion.
3935 assert(opt
->priv
->call_depth
== 0);
3936 assert(!opt
->priv
->toplevel_dir
||
3937 0 == strlen(opt
->priv
->toplevel_dir
));
3939 trace2_region_leave("merge", "sanity checks", opt
->repo
);
3941 /* Default to histogram diff. Actually, just hardcode it...for now. */
3942 opt
->xdl_opts
= DIFF_WITH_ALG(opt
, HISTOGRAM_DIFF
);
3944 /* Handle attr direction stuff for renormalization */
3945 if (opt
->renormalize
)
3946 git_attr_set_direction(GIT_ATTR_CHECKOUT
);
3948 /* Initialization of opt->priv, our internal merge data */
3949 trace2_region_enter("merge", "allocate/init", opt
->repo
);
3951 clear_or_reinit_internal_opts(opt
->priv
, 1);
3952 trace2_region_leave("merge", "allocate/init", opt
->repo
);
3955 opt
->priv
= xcalloc(1, sizeof(*opt
->priv
));
3957 /* Initialization of various renames fields */
3958 renames
= &opt
->priv
->renames
;
3959 for (i
= MERGE_SIDE1
; i
<= MERGE_SIDE2
; i
++) {
3960 strintmap_init_with_options(&renames
->dirs_removed
[i
],
3961 NOT_RELEVANT
, NULL
, 0);
3962 strmap_init_with_options(&renames
->dir_rename_count
[i
],
3964 strmap_init_with_options(&renames
->dir_renames
[i
],
3967 * relevant_sources uses -1 for the default, because we need
3968 * to be able to distinguish not-in-strintmap from valid
3969 * relevant_source values from enum file_rename_relevance.
3970 * In particular, possibly_cache_new_pair() expects a negative
3971 * value for not-found entries.
3973 strintmap_init_with_options(&renames
->relevant_sources
[i
],
3974 -1 /* explicitly invalid */,
3976 strmap_init_with_options(&renames
->cached_pairs
[i
],
3978 strset_init_with_options(&renames
->cached_irrelevant
[i
],
3980 strset_init_with_options(&renames
->cached_target_names
[i
],
3985 * Although we initialize opt->priv->paths with strdup_strings=0,
3986 * that's just to avoid making yet another copy of an allocated
3987 * string. Putting the entry into paths means we are taking
3988 * ownership, so we will later free it. paths_to_free is similar.
3990 * In contrast, conflicted just has a subset of keys from paths, so
3991 * we don't want to free those (it'd be a duplicate free).
3993 strmap_init_with_options(&opt
->priv
->paths
, NULL
, 0);
3994 strmap_init_with_options(&opt
->priv
->conflicted
, NULL
, 0);
3995 string_list_init(&opt
->priv
->paths_to_free
, 0);
3998 * keys & strbufs in output will sometimes need to outlive "paths",
3999 * so it will have a copy of relevant keys. It's probably a small
4000 * subset of the overall paths that have special output.
4002 strmap_init(&opt
->priv
->output
);
4004 trace2_region_leave("merge", "allocate/init", opt
->repo
);
4007 static void merge_check_renames_reusable(struct merge_options
*opt
,
4008 struct merge_result
*result
,
4009 struct tree
*merge_base
,
4013 struct rename_info
*renames
;
4014 struct tree
**merge_trees
;
4015 struct merge_options_internal
*opti
= result
->priv
;
4020 renames
= &opti
->renames
;
4021 merge_trees
= renames
->merge_trees
;
4024 * Handle case where previous merge operation did not want cache to
4025 * take effect, e.g. because rename/rename(1to1) makes it invalid.
4027 if (!merge_trees
[0]) {
4028 assert(!merge_trees
[0] && !merge_trees
[1] && !merge_trees
[2]);
4029 renames
->cached_pairs_valid_side
= 0; /* neither side valid */
4034 * Handle other cases; note that merge_trees[0..2] will only
4035 * be NULL if opti is, or if all three were manually set to
4036 * NULL by e.g. rename/rename(1to1) handling.
4038 assert(merge_trees
[0] && merge_trees
[1] && merge_trees
[2]);
4040 /* Check if we meet a condition for re-using cached_pairs */
4041 if (oideq(&merge_base
->object
.oid
, &merge_trees
[2]->object
.oid
) &&
4042 oideq(&side1
->object
.oid
, &result
->tree
->object
.oid
))
4043 renames
->cached_pairs_valid_side
= MERGE_SIDE1
;
4044 else if (oideq(&merge_base
->object
.oid
, &merge_trees
[1]->object
.oid
) &&
4045 oideq(&side2
->object
.oid
, &result
->tree
->object
.oid
))
4046 renames
->cached_pairs_valid_side
= MERGE_SIDE2
;
4048 renames
->cached_pairs_valid_side
= 0; /* neither side valid */
4051 /*** Function Grouping: merge_incore_*() and their internal variants ***/
4054 * Originally from merge_trees_internal(); heavily adapted, though.
4056 static void merge_ort_nonrecursive_internal(struct merge_options
*opt
,
4057 struct tree
*merge_base
,
4060 struct merge_result
*result
)
4062 struct object_id working_tree_oid
;
4064 if (opt
->subtree_shift
) {
4065 side2
= shift_tree_object(opt
->repo
, side1
, side2
,
4066 opt
->subtree_shift
);
4067 merge_base
= shift_tree_object(opt
->repo
, side1
, merge_base
,
4068 opt
->subtree_shift
);
4071 trace2_region_enter("merge", "collect_merge_info", opt
->repo
);
4072 if (collect_merge_info(opt
, merge_base
, side1
, side2
) != 0) {
4074 * TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4075 * base, and 2-3) the trees for the two trees we're merging.
4077 err(opt
, _("collecting merge info failed for trees %s, %s, %s"),
4078 oid_to_hex(&merge_base
->object
.oid
),
4079 oid_to_hex(&side1
->object
.oid
),
4080 oid_to_hex(&side2
->object
.oid
));
4084 trace2_region_leave("merge", "collect_merge_info", opt
->repo
);
4086 trace2_region_enter("merge", "renames", opt
->repo
);
4087 result
->clean
= detect_and_process_renames(opt
, merge_base
,
4089 trace2_region_leave("merge", "renames", opt
->repo
);
4091 trace2_region_enter("merge", "process_entries", opt
->repo
);
4092 process_entries(opt
, &working_tree_oid
);
4093 trace2_region_leave("merge", "process_entries", opt
->repo
);
4095 /* Set return values */
4096 result
->tree
= parse_tree_indirect(&working_tree_oid
);
4097 /* existence of conflicted entries implies unclean */
4098 result
->clean
&= strmap_empty(&opt
->priv
->conflicted
);
4099 if (!opt
->priv
->call_depth
) {
4100 result
->priv
= opt
->priv
;
4101 result
->_properly_initialized
= RESULT_INITIALIZED
;
4107 * Originally from merge_recursive_internal(); somewhat adapted, though.
4109 static void merge_ort_internal(struct merge_options
*opt
,
4110 struct commit_list
*merge_bases
,
4113 struct merge_result
*result
)
4115 struct commit_list
*iter
;
4116 struct commit
*merged_merge_bases
;
4117 const char *ancestor_name
;
4118 struct strbuf merge_base_abbrev
= STRBUF_INIT
;
4121 merge_bases
= get_merge_bases(h1
, h2
);
4122 /* See merge-ort.h:merge_incore_recursive() declaration NOTE */
4123 merge_bases
= reverse_commit_list(merge_bases
);
4126 merged_merge_bases
= pop_commit(&merge_bases
);
4127 if (merged_merge_bases
== NULL
) {
4128 /* if there is no common ancestor, use an empty tree */
4131 tree
= lookup_tree(opt
->repo
, opt
->repo
->hash_algo
->empty_tree
);
4132 merged_merge_bases
= make_virtual_commit(opt
->repo
, tree
,
4134 ancestor_name
= "empty tree";
4135 } else if (merge_bases
) {
4136 ancestor_name
= "merged common ancestors";
4138 strbuf_add_unique_abbrev(&merge_base_abbrev
,
4139 &merged_merge_bases
->object
.oid
,
4141 ancestor_name
= merge_base_abbrev
.buf
;
4144 for (iter
= merge_bases
; iter
; iter
= iter
->next
) {
4145 const char *saved_b1
, *saved_b2
;
4146 struct commit
*prev
= merged_merge_bases
;
4148 opt
->priv
->call_depth
++;
4150 * When the merge fails, the result contains files
4151 * with conflict markers. The cleanness flag is
4152 * ignored (unless indicating an error), it was never
4153 * actually used, as result of merge_trees has always
4154 * overwritten it: the committed "conflicts" were
4157 saved_b1
= opt
->branch1
;
4158 saved_b2
= opt
->branch2
;
4159 opt
->branch1
= "Temporary merge branch 1";
4160 opt
->branch2
= "Temporary merge branch 2";
4161 merge_ort_internal(opt
, NULL
, prev
, iter
->item
, result
);
4162 if (result
->clean
< 0)
4164 opt
->branch1
= saved_b1
;
4165 opt
->branch2
= saved_b2
;
4166 opt
->priv
->call_depth
--;
4168 merged_merge_bases
= make_virtual_commit(opt
->repo
,
4171 commit_list_insert(prev
, &merged_merge_bases
->parents
);
4172 commit_list_insert(iter
->item
,
4173 &merged_merge_bases
->parents
->next
);
4175 clear_or_reinit_internal_opts(opt
->priv
, 1);
4178 opt
->ancestor
= ancestor_name
;
4179 merge_ort_nonrecursive_internal(opt
,
4180 repo_get_commit_tree(opt
->repo
,
4181 merged_merge_bases
),
4182 repo_get_commit_tree(opt
->repo
, h1
),
4183 repo_get_commit_tree(opt
->repo
, h2
),
4185 strbuf_release(&merge_base_abbrev
);
4186 opt
->ancestor
= NULL
; /* avoid accidental re-use of opt->ancestor */
4189 void merge_incore_nonrecursive(struct merge_options
*opt
,
4190 struct tree
*merge_base
,
4193 struct merge_result
*result
)
4195 trace2_region_enter("merge", "incore_nonrecursive", opt
->repo
);
4197 trace2_region_enter("merge", "merge_start", opt
->repo
);
4198 assert(opt
->ancestor
!= NULL
);
4199 merge_check_renames_reusable(opt
, result
, merge_base
, side1
, side2
);
4200 merge_start(opt
, result
);
4202 * Record the trees used in this merge, so if there's a next merge in
4203 * a cherry-pick or rebase sequence it might be able to take advantage
4204 * of the cached_pairs in that next merge.
4206 opt
->priv
->renames
.merge_trees
[0] = merge_base
;
4207 opt
->priv
->renames
.merge_trees
[1] = side1
;
4208 opt
->priv
->renames
.merge_trees
[2] = side2
;
4209 trace2_region_leave("merge", "merge_start", opt
->repo
);
4211 merge_ort_nonrecursive_internal(opt
, merge_base
, side1
, side2
, result
);
4212 trace2_region_leave("merge", "incore_nonrecursive", opt
->repo
);
4215 void merge_incore_recursive(struct merge_options
*opt
,
4216 struct commit_list
*merge_bases
,
4217 struct commit
*side1
,
4218 struct commit
*side2
,
4219 struct merge_result
*result
)
4221 trace2_region_enter("merge", "incore_recursive", opt
->repo
);
4223 /* We set the ancestor label based on the merge_bases */
4224 assert(opt
->ancestor
== NULL
);
4226 trace2_region_enter("merge", "merge_start", opt
->repo
);
4227 merge_start(opt
, result
);
4228 trace2_region_leave("merge", "merge_start", opt
->repo
);
4230 merge_ort_internal(opt
, merge_bases
, side1
, side2
, result
);
4231 trace2_region_leave("merge", "incore_recursive", opt
->repo
);