http-push.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
David Rientjes 2006-08-14 13:37:05 -07:00 committed by Junio C Hamano
parent 8c0b2bb636
commit 0bc87ffb6c

View File

@ -2186,10 +2186,7 @@ static int verify_merge_base(unsigned char *head_sha1, unsigned char *branch_sha
struct commit *branch = lookup_commit(branch_sha1);
struct commit_list *merge_bases = get_merge_bases(head, branch, 1);
if (merge_bases && !merge_bases->next && merge_bases->item == branch)
return 1;
return 0;
return (merge_bases && !merge_bases->next && merge_bases->item == branch);
}
static int delete_remote_branch(char *pattern, int force)