diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-02-28 09:44:09 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-28 09:47:03 -0800 |
commit | 24876ebf68baf90075dad5ca3acba8a305f308d4 (patch) | |
tree | 99968921866edefd3c3a357073df5652232f3f85 /http-push.c | |
parent | 207c40e1e43c992a8b268a3395ca104566612c6e (diff) | |
download | git-24876ebf68baf90075dad5ca3acba8a305f308d4.tar.gz |
commit-reach(repo_in_merge_bases_many): report missing commits
Some functions in Git's source code follow the convention that returning
a negative value indicates a fatal error, e.g. repository corruption.
Let's use this convention in `repo_in_merge_bases()` to report when one
of the specified commits is missing (i.e. when `repo_parse_commit()`
reports an error).
Also adjust the callers of `repo_in_merge_bases()` to handle such
negative return values.
Note: As of this patch, errors are returned only if any of the specified
merge heads is missing. Over the course of the next patches, missing
commits will also be reported by the `paint_down_to_common()` function,
which is called by `repo_in_merge_bases_many()`, and those errors will
be properly propagated back to the caller at that stage.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-push.c')
-rw-r--r-- | http-push.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c index 12d1113741..33db41bfac 100644 --- a/http-push.c +++ b/http-push.c @@ -1575,8 +1575,11 @@ static int verify_merge_base(struct object_id *head_oid, struct ref *remote) struct commit *head = lookup_commit_or_die(head_oid, "HEAD"); struct commit *branch = lookup_commit_or_die(&remote->old_oid, remote->name); + int ret = repo_in_merge_bases(the_repository, branch, head); - return repo_in_merge_bases(the_repository, branch, head); + if (ret < 0) + exit(128); + return ret; } static int delete_remote_branch(const char *pattern, int force) |