From: David Rientjes <rientjes@google.com>
Date: Mon, 14 Aug 2006 20:37:05 +0000 (-0700)
Subject: http-push.c cleanup
X-Git-Tag: v1.4.3-rc1~250
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37;p=git.git

http-push.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/http-push.c b/http-push.c
index 0359ae5b6..22a3e2bc0 100644
--- a/http-push.c
+++ b/http-push.c
@@ -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)