[PATCH v5 02/18] merge-ort: correct reference to test in 62fdec17a11
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Mar 31, 2021, 19:09 UTC
- Message-ID
- <patch-02.19-57092359bbb-20210331T190531Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.19-00000000000-20210331T190531Z-avarab@gmail.com>
Fix a comment added in 62fdec17a11 (merge-ort: flesh out implementation of handle_content_merge(), 2021-01-01).
The test being referred to here was moved from t6036 in 919df319555 (Collect merge-related tests to t64xx, 2020-08-10).
It has also had the plural of "mode" in the name ever since being introduced in 5d1daf30cce (t6036: add a failed conflict detection case: regular files, different modes, 2018-06-30).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/merge-ort.c b/merge-ort.c index ba35600d4e0..dd1f38e3c32 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1073,7 +1073,7 @@ static int handle_content_merge(struct merge_options *opt, /* * FIXME: If opt->priv->call_depth && !clean, then we really * should not make result->mode match either a->mode or - * b->mode; that causes t6036 "check conflicting mode for + * b->mode; that causes t6416 "check conflicting modes for * regular file" to fail. It would be best to use some other * mode, but we'll confuse all kinds of stuff if we use one * where S_ISREG(result->mode) isn't true, and if we use
-- 2.31.1.474.g72d45d12706