Merge branch 'jc/mention-tracking-for-pull-default'

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

index 9923441a4ec74cfdfd3c36b1be41762c04697bdd..bd66f6ab6edd24946d2bc84e117a2b97417b1503 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,11 @@
  #include "list-objects.h"
  #include "sigchain.h"
  
+#ifdef EXPAT_NEEDS_XMLPARSE_H
+#include <xmlparse.h>
+#else
  #include <expat.h>
+#endif
  
  static const char http_push_usage[] =
  "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
@@ -1539,7 +1543,7 @@ static int remote_exists(const char *path)
  
         sprintf(url, "%s%s", repo->url, path);
  
-       switch (http_get_strbuf(url, NULL, 0)) {
+       switch (http_get_strbuf(url, NULL, NULL, 0)) {
         case HTTP_OK:
                 ret = 1;
                 break;
@@ -1563,7 +1567,7 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
         url = xmalloc(strlen(repo->url) + strlen(path) + 1);
         sprintf(url, "%s%s", repo->url, path);
  
-       if (http_get_strbuf(url, &buffer, 0) != HTTP_OK)
+       if (http_get_strbuf(url, NULL, &buffer, 0) != HTTP_OK)
                 die("Couldn't get %s for remote symref\n%s", url,
                     curl_errorstr);
         free(url);