]> git.ipfire.org Git - thirdparty/git.git/commit
merge-recursive: prepare for `merge_submodule()` to report errors
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 9 Mar 2024 14:09:56 +0000 (14:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Mar 2024 17:57:05 +0000 (09:57 -0800)
commit81a34cbb2e808aa93071a924336072b9a05470eb
tree89882097e69621c05a92b32d53ec0609394d9765
parentcaaf1a2942c25c1f1a15818b718c9f641e52beef
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>
merge-recursive.c