@matheusbsbs / matheus-bagliano / commits / 34ce504a33

merge-ort: avoid surprise with new sub_flag variable

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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Aug 18, 2022 at 07:15 UTC 34ce504a33cca435b3fc689c3e2a0ae2f71d5a85

1 file changed +1 -1

merge-ort.c

+1 -1

@@ -1767,7 +1767,7 @@ static int merge_submodule(struct merge_options *opt,

1767 int i;

1768 int search = !opt->priv->call_depth;

1769 int sub_not_initialized = 1;

1770 - int sub_flag = -1;

1770 + int sub_flag = CONFLICT_SUBMODULE_FAILED_TO_MERGE;

1771

1772 /* store fallback answer in result in case we fail */

1773 oidcpy(result, opt->priv->call_depth ? o : a);