[PATCH 22/28] http-push.c cleanup
From: David Rientjes <rientjes@google.com>
Date: 2016-06-15 22:42:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: David Rientjes <rientjes@google.com>
Date: 2016-06-15 22:42:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Removes conditional return. David Signed-off-by: David Rientjes <rientjes@google.com> --- http-push.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/http-push.c b/http-push.c
index 0359ae5..511875f 100644
--- a/http-push.c
+++ b/http-push.c@@ -2186,10 +2186,7 @@ static int verify_merge_base(unsigned ch 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)
--
1.4.2.g89bb-dirty