diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-02-28 09:44:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-29 08:06:01 -0800 |
| commit | f87056ce403b5572683a45efe0e9021777831894 (patch) | |
| tree | a1a74dad2de404166616592ab118bb7413b0ad24 /builtin/merge.c | |
| parent | 76e2a0999907644966dfe48b573d6e57e2f1e275 (diff) | |
| download | git-f87056ce403b5572683a45efe0e9021777831894.tar.gz | |
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>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7c0189fb8f..52828edee0 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1523,7 +1523,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } else { struct commit_list *list = remoteheads; commit_list_insert(head_commit, &list); - common = get_octopus_merge_bases(list); + if (get_octopus_merge_bases(list, &common) < 0) { + free(list); + ret = 2; + goto done; + } free(list); } |