diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-03-09 14:09:57 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-09 09:57:16 -0800 |
commit | 25fd20eb44cfcbb0652595de2144f0e077a957ec (patch) | |
tree | 352aff7cf8e17b6f9db49bd3b879575d05886974 /builtin/commit.c | |
parent | 81a34cbb2e808aa93071a924336072b9a05470eb (diff) |
merge-ort/merge-recursive: do report errors in `merge_submodule()`
In 24876ebf68b (commit-reach(repo_in_merge_bases_many): report missing
commits, 2024-02-28), I taught `merge_submodule()` to handle errors
reported by `repo_in_merge_bases_many()`.
However, those errors were not passed through to the callers. That was
unintentional, and this commit remedies that.
Note that `find_first_merges()` can now also return -1 (because it
passes through that return value from `repo_in_merge_bases()`), and this
commit also adds the forgotten handling for 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