summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2006-08-14 20:37:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-15 01:41:12 (GMT)
commit0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37 (patch)
tree438e2015d0ed8b639a2609342efb6b131e936cf1 /http-push.c
parent8c0b2bb636c15a1cd0adb8bcf3b42497d699c884 (diff)
downloadgit-0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37.zip
git-0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37.tar.gz
git-0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37.tar.bz2
http-push.c cleanup
Removes conditional return. Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/http-push.c b/http-push.c
index 0359ae5..22a3e2b 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)