Skip to content

Commit eb3b25e

Browse files
newrenderrickstolee
authored andcommitted
directory-rename-detection.txt: small updates due to merge-ort optimizations
In commit 0c4fd73 ("Move computation of dir_rename_count from merge-ort to diffcore-rename", 2021-02-27), much of the logic for computing directory renames moved into diffcore-rename. directory-rename-detection.txt had claims that all of that logic was found in merge-recursive. Update the documentation. Signed-off-by: Elijah Newren <[email protected]>
1 parent 2dddf82 commit eb3b25e

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Documentation/technical/directory-rename-detection.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Directory rename detection
22
==========================
33

44
Rename detection logic in diffcore-rename that checks for renames of
5-
individual files is aggregated and analyzed in merge-recursive for cases
6-
where combinations of renames indicate that a full directory has been
7-
renamed.
5+
individual files is also aggregated there and then analyzed in either
6+
merge-ort or merge-recursive for cases where combinations of renames
7+
indicate that a full directory has been renamed.
88

99
Scope of abilities
1010
------------------
@@ -88,9 +88,11 @@ directory rename detection support in:
8888
Folks have requested in the past that `git diff` detect directory
8989
renames and somehow simplify its output. It is not clear whether this
9090
would be desirable or how the output should be simplified, so this was
91-
simply not implemented. Further, to implement this, directory rename
92-
detection logic would need to move from merge-recursive to
93-
diffcore-rename.
91+
simply not implemented. Also, while diffcore-rename has most of the
92+
logic for detecting directory renames, some of the logic is still found
93+
within merge-ort and merge-recursive. Fully supporting directory
94+
rename detection in diffs would require copying or moving the remaining
95+
bits of logic to the diff machinery.
9496

9597
* am
9698

0 commit comments

Comments
 (0)