| commit | 34ce504a33cca435b3fc689c3e2a0ae2f71d5a85 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 18 Aug 2022 07:15:26 +0000 (18 07:15 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Aug 2022 16:49:30 +0000 (18 09:49 -0700) | ||
| tree | 77421b23b003e57de6dc0a45ee6e874ff17e6233 | treesnapshot (tar.gz zip) |
| parent | a5834b775b233d61b71927e1e0b98d2372406492 | commitdiff |
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>
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>
| merge-ort.c | diffblobblamehistory |