http-push: use in_merge_bases() for fast-forward check
The original computed merge-base between HEAD and the remote ref and checked if the remote ref is a merge base between them, in order to make sure that we are fast-forwarding. Instead, call in_merge_bases(remote, HEAD) which does the same. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 27, 2012 at 15:21 UTC
6571225137b1ba270b49a0dfc6a30aab6f4b86ba
1 file changed
+1
-2
http-push.c
+1
-2
@@ -1610,9 +1610,8 @@ static int verify_merge_base(unsigned char *head_sha1, struct ref *remote)
1610
{
1611
struct commit *head = lookup_commit_or_die(head_sha1, "HEAD");
1612
struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name);
1613
- struct commit_list *merge_bases = get_merge_bases(head, branch, 1);
1613
1615
- return (merge_bases && !merge_bases->next && merge_bases->item == branch);
1614
+ return in_merge_bases(branch, head);
1615
}
1616
1617
static int delete_remote_branch(const char *pattern, int force)