diff options
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) |