directory-rename-detection.txt: small updates due to merge-ort optimizations
In commit 0c4fd732f0 ("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. Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 4, 2021 at 23:50 UTC
b378df72ed147d346503341db06771c52cd2dbb8
1 file changed
+8
-6
Documentation/technical/directory-rename-detection.txt
+8
-6
@@ -2,9 +2,9 @@ Directory rename detection
2
==========================
3
4
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.
8
9
Scope of abilities
10
------------------
@@ -88,9 +88,11 @@ directory rename detection support in:
88
Folks have requested in the past that `git diff` detect directory
89
renames and somehow simplify its output. It is not clear whether this
90
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.
96
97
* am
98