diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:54 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
| commit | 41376b58e6332796343a76b222334901207065ae (patch) | |
| tree | 51566ddb09091da2efe8a50f5c1be172ebe4d878 | |
| parent | merge-recursive: add a bunch of FIXME comments documenting known bugs (diff) | |
| download | tgif-41376b58e6332796343a76b222334901207065ae.tar.xz | |
Revert "merge-ort: ignore the directory rename split conflict for now"
This reverts commit 5ced7c3da009090c5a926e3123a71314c7f28d42, which was
put in place as a temporary measure to avoid optimizations unstably
erroring out on no destination having a majority of the necessary
renames for directories that had no new files and thus no need for
directory rename detection anyway. Now that optimizations are in place
to prevent us from trying to compute directory rename count computations
for directories that do not need it, we can undo this temporary measure.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-ort.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/merge-ort.c b/merge-ort.c index e8f1a435f9..8258d3fd62 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1636,18 +1636,7 @@ static void get_provisional_directory_renames(struct merge_options *opt, "no destination getting a majority of the " "files."), source_dir); - /* - * We should mark this as unclean IF something attempts - * to use this rename. We do not yet have the logic - * in place to detect if this directory rename is being - * used, and optimizations that reduce the number of - * renames cause this to falsely trigger. For now, - * just disable it, causing t6423 testcase 2a to break. - * We'll later fix the detection, and when we do we - * will re-enable setting *clean to 0 (and thereby fix - * t6423 testcase 2a). - */ - /* *clean = 0; */ + *clean = 0; } else { strmap_put(&renames->dir_renames[side], source_dir, (void*)best); |