undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http-fetch: refactor into function

Browse Source 
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>
This commit is contained in:
Jonathan Tan 2020-06-10 13:57:17 -07:00 committed by Junio C Hamano
parent eb05349247
commit 8e6adb69e1
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
http-fetch.c
View File

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