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>
Elijah Newren committed
Mar 20, 2021 at 00:03 UTC
41376b58e6332796343a76b222334901207065ae
1 file changed
+1
-12
merge-ort.c
+1
-12
@@ -1636,18 +1636,7 @@ static void get_provisional_directory_renames(struct merge_options *opt,
1636
"no destination getting a majority of the "
1637
"files."),
1638
source_dir);
1639
- /*
1640
- * We should mark this as unclean IF something attempts
1641
- * to use this rename. We do not yet have the logic
1642
- * in place to detect if this directory rename is being
1643
- * used, and optimizations that reduce the number of
1644
- * renames cause this to falsely trigger. For now,
1645
- * just disable it, causing t6423 testcase 2a to break.
1646
- * We'll later fix the detection, and when we do we
1647
- * will re-enable setting *clean to 0 (and thereby fix
1648
- * t6423 testcase 2a).
1649
- */
1650
- /* *clean = 0; */
1639
+ *clean = 0;
1640
} else {
1641
strmap_put(&renames->dir_renames[side],
1642
source_dir, (void*)best);