Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
http-push.c cleanup
author
David Rientjes
<rientjes@google.com>
Mon, 14 Aug 2006 20:37:05 +0000
(13:37 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 15 Aug 2006 01:41:12 +0000
(18:41 -0700)
Removes conditional return.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
http-push.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
8c0b2bb
)
diff --git
a/http-push.c
b/http-push.c
index 0359ae5b6f421c9b1b0229a2aa7019510a656ef2..22a3e2bc0abbaadbe86a69dace48fd40ab575405 100644
(file)
--- 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)