From: Elijah Newren Date: Wed, 19 Jun 2024 03:00:17 +0000 (+0000) Subject: merge-ort: loosen commented requirements X-Git-Tag: v2.46.0-rc1~20^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64;p=thirdparty%2Fgit.git merge-ort: loosen commented requirements 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 Signed-off-by: Junio C Hamano --- diff --git a/merge-ort.c b/merge-ort.c index d187c966c6..d0b1346328 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 ***/