From: Elijah Newren via GitGitGadget Date: Thu, 18 Aug 2022 07:15:26 GMT Subject: [PATCH v3 2/3] merge-ort: avoid surprise with new sub_flag variable Message-ID: <48200773a1bbe8467e37db637c99c85be2c809ec.1660806927.git.gitgitgadget@gmail.com> In-Reply-To: From: Elijah Newren Commit 4057523a40 ("submodule merge: update conflict error message", 2022-08-04) added a sub_flag variable that is used to store a value from enum conflict_and_info_types, but initializes it with a value of -1 that does not correspond to any of the conflict_and_info_types. The code may never set it to a valid value and yet still use it, which can be surprising when reading over the code at first. Initialize it instead to the generic CONFLICT_SUBMODULE_FAILED_TO_MERGE value, which is still distinct from the two values we need to special case. 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 67159fc6ef9..8f14f1ad0b2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1767,7 +1767,7 @@ static int merge_submodule(struct merge_options *opt, int i; int search = !opt->priv->call_depth; int sub_not_initialized = 1; - int sub_flag = -1; + int sub_flag = CONFLICT_SUBMODULE_FAILED_TO_MERGE; /* store fallback answer in result in case we fail */ oidcpy(result, opt->priv->call_depth ? o : a); -- gitgitgadget