diff options
| -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); |