Skip to content

Commit b9718d0

Browse files
newrengitster
authored andcommitted
directory-rename-detection.txt: update references to regression tests
The regression tests for directory rename detection were renamed from t6043 to t6423 in commit 919df31 ("Collect merge-related tests to t64xx", 2020-08-10); update this file to match. Also, add a small clarification to nearby text while we're at it. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a5fa49f commit b9718d0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Documentation/technical/directory-rename-detection.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ It is perhaps easiest to start with an example:
1818
More interesting possibilities exist, though, such as:
1919

2020
* one side of history renames x -> z, and the other renames some file to
21-
x/e, causing the need for the merge to do a transitive rename.
21+
x/e, causing the need for the merge to do a transitive rename so that
22+
the rename ends up at z/e.
2223

2324
* one side of history renames x -> z, but also renames all files within x.
2425
For example, x/a -> z/alpha, x/b -> z/bravo, etc.
@@ -35,7 +36,7 @@ More interesting possibilities exist, though, such as:
3536
directory itself contained inner directories that were renamed to yet
3637
other locations).
3738

38-
* combinations of the above; see t/t6043-merge-rename-directories.sh for
39+
* combinations of the above; see t/t6423-merge-rename-directories.sh for
3940
various interesting cases.
4041

4142
Limitations -- applicability of directory renames
@@ -62,7 +63,7 @@ directory rename detection applies:
6263
Limitations -- detailed rules and testcases
6364
-------------------------------------------
6465

65-
t/t6043-merge-rename-directories.sh contains extensive tests and commentary
66+
t/t6423-merge-rename-directories.sh contains extensive tests and commentary
6667
which generate and explore the rules listed above. It also lists a few
6768
additional rules:
6869

0 commit comments

Comments
 (0)