diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-03-09 14:09:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-09 09:57:05 -0800 |
| commit | 81a34cbb2e808aa93071a924336072b9a05470eb (patch) | |
| tree | 89882097e69621c05a92b32d53ec0609394d9765 /builtin/commit.c | |
| parent | caaf1a2942c25c1f1a15818b718c9f641e52beef (diff) | |
merge-recursive: prepare for `merge_submodule()` to report errors
The `merge_submodule()` function returns an integer that indicates
whether the merge was clean (returning 1) or unclean (returning 0).
Like the version in `merge-ort.c`, the version in `merge-recursive.c`
does not report any errors (such as repository corruption) by returning
-1 as of time of writing, even if the callers in `merge-ort.c` are
prepared for exactly such errors.
However, we want to teach (both variants of) the `merge_submodule()`
function that trick: to report errors by returning -1. Therefore,
prepare the caller in `merge-recursive.c` to handle that scenario.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions