http-fetch: refactor into function

cmd_main() in http-fetch.c will grow in a future patch, so refactor the
HTTP walking part into its own function.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-fetch.c b/http-fetch.c
index a32ac118d90ca6141a72d31f47497116870f6803..e538174bde42e5a17e0bf6cb03b2dec9e8dfd843 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -7,16 +7,49 @@
 static const char http_fetch_usage[] = "git http-fetch "
 "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url";
 
-int cmd_main(int argc, const char **argv)
+static int fetch_using_walker(const char *raw_url, int get_verbosely,
+                             int get_recover, int commits, char **commit_id,
+                             const char **write_ref, int commits_on_stdin)
 {
+       char *url = NULL;
        struct walker *walker;
+       int rc;
+
+       str_end_url_with_slash(raw_url, &url);
+
+       http_init(NULL, url, 0);
+
+       walker = get_http_walker(url);
+       walker->get_verbosely = get_verbosely;
+       walker->get_recover = get_recover;
+       walker->get_progress = 0;
+
+       rc = walker_fetch(walker, commits, commit_id, write_ref, url);
+
+       if (commits_on_stdin)
+               walker_targets_free(commits, commit_id, write_ref);
+
+       if (walker->corrupt_object_found) {
+               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");
+       }
+
+       walker_free(walker);
+       http_cleanup();
+       free(url);
+
+       return rc;
+}
+
+int cmd_main(int argc, const char **argv)
+{
        int commits_on_stdin = 0;
        int commits;
        const char **write_ref = NULL;
        char **commit_id;
-       char *url = NULL;
        int arg = 1;
-       int rc = 0;
        int get_verbosely = 0;
        int get_recover = 0;
 
@@ -47,34 +80,14 @@ int cmd_main(int argc, const char **argv)
                commits = 1;
        }
 
-       if (argv[arg])
-               str_end_url_with_slash(argv[arg], &url);
-
        setup_git_directory();
 
        git_config(git_default_config, NULL);
 
-       http_init(NULL, url, 0);
-       walker = get_http_walker(url);
-       walker->get_verbosely = get_verbosely;
-       walker->get_recover = get_recover;
-
-       rc = walker_fetch(walker, commits, commit_id, write_ref, url);
-
-       if (commits_on_stdin)
-               walker_targets_free(commits, commit_id, write_ref);
+       if (!argv[arg])
+               BUG("must have one arg remaining");
 
-       if (walker->corrupt_object_found) {
-               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");
-       }
-
-       walker_free(walker);
-       http_cleanup();
-
-       free(url);
-
-       return rc;
+       return fetch_using_walker(argv[arg], get_verbosely, get_recover,
+                                 commits, commit_id, write_ref,
+                                 commits_on_stdin);
 }