Merge branch 'maint'

[git.git] / http-push.c
diff --git a/http-push.c b/http-push.c

index 665712a85de3fb4bba3a879753b60ece64a4243a..c9dd9a1f6475cc8772b1e0f528a9f54751d6445a 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -14,7 +14,7 @@
  #include <expat.h>
  
  static const char http_push_usage[] =
-"git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
+"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
  
  #ifndef XML_STATUS_OK
  enum XML_Status {
@@ -783,7 +783,7 @@ static void finish_request(struct transfer_request *request)
                                         lst = &((*lst)->next);
                                 *lst = (*lst)->next;
  
-                               if (!verify_pack(target, 0))
+                               if (!verify_pack(target))
                                         install_packed_git(target);
                                 else
                                         remote->can_update_info_refs = 0;
@@ -2237,7 +2237,7 @@ int main(int argc, char **argv)
         no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
  
         if (remote->url && remote->url[strlen(remote->url)-1] != '/') {
-               rewritten_url = malloc(strlen(remote->url)+2);
+               rewritten_url = xmalloc(strlen(remote->url)+2);
                 strcpy(rewritten_url, remote->url);
                 strcat(rewritten_url, "/");
                 remote->url = rewritten_url;