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 /commit-reach.h | |
| parent | commit-reach(repo_get_merge_bases): pass on "missing commits" errors (diff) | |
| download | git-f87056ce403b5572683a45efe0e9021777831894.tar.gz git-f87056ce403b5572683a45efe0e9021777831894.zip | |
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 'commit-reach.h')
| -rw-r--r-- | commit-reach.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commit-reach.h b/commit-reach.h index 2c6fcdd34f..4690b6ecd0 100644 --- a/commit-reach.h +++ b/commit-reach.h @@ -21,7 +21,7 @@ struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r, struct commit *one, int n, struct commit **twos); -struct commit_list *get_octopus_merge_bases(struct commit_list *in); +int get_octopus_merge_bases(struct commit_list *in, struct commit_list **result); int repo_is_descendant_of(struct repository *r, struct commit *commit, |