From: Elijah Newren via GitGitGadget Date: Thu, 13 Jun 2024 20:25:05 GMT Subject: [PATCH 5/7] merge-ort: loosen commented requirements Message-ID: <975fbddf3053d678df5cdfc75521b1be9e2533ce.1718310307.git.gitgitgadget@gmail.com> In-Reply-To: From: Elijah Newren The comment above type_short_descriptions claimed that the order had to match what was found in the conflict_info_and_types enum. Since type_short_descriptions uses designated initializers, the order should not actually matter; I am guessing that positional initializers may have been under consideration when that comment was added, but the comment was not updated when designated initializers were chosen. Signed-off-by: Elijah Newren --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 39799e65a36..462bc6fb6e1 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -553,7 +553,7 @@ enum conflict_and_info_types { * Short description of conflict type, relied upon by external tools. * * We can add more entries, but DO NOT change any of these strings. Also, - * Order MUST match conflict_info_and_types. + * please ensure the order matches what is used in conflict_info_and_types. */ static const char *type_short_descriptions[] = { /*** "Simple" conflicts and informational messages ***/ -- gitgitgadget