read-cache.c cleanup

diff --git a/http-push.c b/http-push.c
index dc82657830d22d7e66575e9fcf47685e80b21fd4..22a3e2bc0abbaadbe86a69dace48fd40ab575405 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -530,7 +530,7 @@ static void start_put(struct transfer_request *request)
        request->dest = xmalloc(strlen(request->url) + 14);
        sprintf(request->dest, "Destination: %s", request->url);
        posn += 38;
-       *(posn++) = '.';
+       *(posn++) = '_';
        strcpy(posn, request->lock->token);
 
        slot = get_active_slot();
@@ -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)