merge-ort: update comments to modern testfile location
In commit 919df3195553 (Collect merge-related tests to t64xx, 2020-08-10), merge related tests were moved from t60xx to t64xx. Some comments in merge-ort relating to some tricky code referenced specific testcases within certain testfiles for additional information, but referred to their historical testfile names; update the testfile names to mention their modern location. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 6, 2025 at 23:15 UTC
c5a2c765a0045ee90473ce1e45947226d5f427c1
1 file changed
+3
-3
merge-ort.c
+3
-3
@@ -2163,7 +2163,7 @@ static int handle_content_merge(struct merge_options *opt,
2163
/*
2164
* FIXME: If opt->priv->call_depth && !clean, then we really
2165
* should not make result->mode match either a->mode or
2166
- * b->mode; that causes t6036 "check conflicting mode for
2166
+ * b->mode; that causes t6416 "check conflicting mode for
2167
* regular file" to fail. It would be best to use some other
2168
* mode, but we'll confuse all kinds of stuff if we use one
2169
* where S_ISREG(result->mode) isn't true, and if we use
@@ -2520,7 +2520,7 @@ static void compute_collisions(struct strmap *collisions,
2520
* happening, and fall back to no-directory-rename detection
2521
* behavior for those paths.
2522
*
2523
- * See testcases 9e and all of section 5 from t6043 for examples.
2523
+ * See testcases 9e and all of section 5 from t6423 for examples.
2524
*/
2525
for (i = 0; i < pairs->nr; ++i) {
2526
struct strmap_entry *rename_info;
@@ -2618,7 +2618,7 @@ static char *check_for_directory_rename(struct merge_options *opt,
2618
* That's why otherinfo and dir_rename_exclusions is here.
2619
*
2620
* As it turns out, this also prevents N-way transient rename
2621
- * confusion; See testcases 9c and 9d of t6043.
2621
+ * confusion; See testcases 9c and 9d of t6423.
2622
*/
2623
new_dir = rename_info->value; /* old_dir = rename_info->key; */
2624
otherinfo = strmap_get_entry(dir_rename_exclusions, new_dir);