aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2024-02-28 09:44:16 +0000
committerJunio C Hamano <gitster@pobox.com>2024-02-29 08:06:01 -0800
commit531738052158fd66bc9b65534309f5c0a9d2808d (patch)
tree6ee90ae876a6b7523575d46931df66295ffb2cc3 /merge-recursive.c
parentcommit-reach(get_octopus_merge_bases): pass on "missing commits" errors (diff)
downloadgit-531738052158fd66bc9b65534309f5c0a9d2808d.tar.gz
git-531738052158fd66bc9b65534309f5c0a9d2808d.zip
commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors
The `merge_bases_many()` function was just taught to indicate parsing errors, and now the `repo_get_merge_bases_many()` function is aware of that, too. Naturally, there are a lot of callers that need to be adjusted now, too. Next stop: `repo_get_merge_bases_dirty()`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions