diff options
| author | David Rientjes <rientjes@google.com> | 2006-08-14 13:37:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-14 18:41:12 -0700 |
| commit | 0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37 (patch) | |
| tree | 438e2015d0ed8b639a2609342efb6b131e936cf1 /http-push.c | |
| parent | 8c0b2bb636c15a1cd0adb8bcf3b42497d699c884 (diff) | |
| download | git-0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37.tar.gz git-0bc87ffb6c8edbb44bd72a4e1a5aa81c64f7eb37.tar.xz | |
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) |