diff options
| author | Elijah Newren <newren@gmail.com> | 2022-08-18 07:15:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-18 09:49:30 -0700 |
| commit | 34ce504a33cca435b3fc689c3e2a0ae2f71d5a85 (patch) | |
| tree | 77421b23b003e57de6dc0a45ee6e874ff17e6233 /commit-graph.c | |
| parent | merge-ort: remove translator lego in new "submodule conflict suggestion" (diff) | |
| download | git-34ce504a33cca435b3fc689c3e2a0ae2f71d5a85.tar.gz git-34ce504a33cca435b3fc689c3e2a0ae2f71d5a85.zip | |
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>
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions