]> git.ipfire.org Git - thirdparty/git.git/commit
commit-reach(get_octopus_merge_bases): pass on "missing commits" errors
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 28 Feb 2024 09:44:15 +0000 (09:44 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Feb 2024 16:06:01 +0000 (08:06 -0800)
commitf87056ce403b5572683a45efe0e9021777831894
treea1a74dad2de404166616592ab118bb7413b0ad24
parent76e2a0999907644966dfe48b573d6e57e2f1e275
commit-reach(get_octopus_merge_bases): pass on "missing commits" errors

The `merge_bases_many()` function was just taught to indicate parsing
errors, and now the `repo_get_merge_bases()` function (which is also
surfaced via the `get_merge_bases()` macro) is aware of that, too.

Naturally, the callers need to be adjusted now, too.

Next step: adjust `repo_get_merge_bases_many()`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-base.c
builtin/merge.c
builtin/pull.c
commit-reach.c
commit-reach.h