compat/mingw: Support a timeout in the poll emulation if no fds are given

[git.git] / builtin-http-fetch.c

diff --git a/builtin-http-fetch.c b/builtin-http-fetch.c
index b1f33891c36fe38d855ace535cf9218fe9603541..f3e63d7206604029504aaf85b3d2e7731d054d2c 100644 (file)
--- a/builtin-http-fetch.c
+++ b/builtin-http-fetch.c
@@ -18,7 +18,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
        int get_verbosely = 0;
        int get_recover = 0;
 
        int get_verbosely = 0;
        int get_recover = 0;
 

-       git_config(git_default_config);
+       git_config(git_default_config, NULL);

 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {


@@ -42,7 +42,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
                arg++;
        }
        if (argc < arg + 2 - commits_on_stdin) {
                arg++;
        }
        if (argc < arg + 2 - commits_on_stdin) {

-               usage("git-http-fetch [-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url");
+               usage("git http-fetch [-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url");

                return 1;
        }
        if (commits_on_stdin) {
                return 1;
        }
        if (commits_on_stdin) {


@@ -53,7 +53,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
        }
        url = argv[arg];
        if (url && url[strlen(url)-1] != '/') {
        }
        url = argv[arg];
        if (url && url[strlen(url)-1] != '/') {

-               rewritten_url = malloc(strlen(url)+2);
+               rewritten_url = xmalloc(strlen(url)+2);

                strcpy(rewritten_url, url);
                strcat(rewritten_url, "/");
                url = rewritten_url;
                strcpy(rewritten_url, url);
                strcat(rewritten_url, "/");
                url = rewritten_url;


@@ -75,7 +75,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
                fprintf(stderr,
 "Some loose object were found to be corrupt, but they might be just\n"
 "a false '404 Not Found' error message sent with incorrect HTTP\n"
                fprintf(stderr,
 "Some loose object were found to be corrupt, but they might be just\n"
 "a false '404 Not Found' error message sent with incorrect HTTP\n"

-"status code.  Suggest running git-fsck.\n");
+"status code.  Suggest running 'git fsck'.\n");

        }
 
        walker_free(walker);
        }
 
        walker_free(walker);