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

fetch: refactor calculation of remote list

Browse Source 
Separate out the calculation of remotes to be fetched from and the
actual fetching. This will allow us to include an additional step before
the actual fetching in a subsequent commit.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan 2017-12-08 15:58:43 +00:00 committed by Junio C Hamano
parent 0b6069fe0a
commit a1743343f4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/fetch.c
View File

@ -1322,7 +1322,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
{ {
int i; int i;
struct string_list list = STRING_LIST_INIT_DUP; struct string_list list = STRING_LIST_INIT_DUP;
struct remote *remote; struct remote *remote = NULL;
int result = 0; int result = 0;
struct argv_array argv_gc_auto = ARGV_ARRAY_INIT; struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
@ -1367,17 +1367,14 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
else if (argc > 1) else if (argc > 1)
die(_("fetch --all does not make sense with refspecs")); die(_("fetch --all does not make sense with refspecs"));
(void) for_each_remote(get_one_remote_for_fetch, &list); (void) for_each_remote(get_one_remote_for_fetch, &list);
result = fetch_multiple(&list);
} else if (argc == 0) { } else if (argc == 0) {
/* No arguments -- use default remote */ /* No arguments -- use default remote */
remote = remote_get(NULL); remote = remote_get(NULL);
result = fetch_one(remote, argc, argv);
} else if (multiple) { } else if (multiple) {
/* All arguments are assumed to be remotes or groups */ /* All arguments are assumed to be remotes or groups */
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
if (!add_remote_or_group(argv[i], &list)) if (!add_remote_or_group(argv[i], &list))
die(_("No such remote or remote group: %s"), argv[i]); die(_("No such remote or remote group: %s"), argv[i]);
result = fetch_multiple(&list);
} else { } else {
/* Single remote or group */ /* Single remote or group */
(void) add_remote_or_group(argv[0], &list); (void) add_remote_or_group(argv[0], &list);
@ -1385,14 +1382,19 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
/* More than one remote */ /* More than one remote */
if (argc > 1) if (argc > 1)
die(_("Fetching a group and specifying refspecs does not make sense")); die(_("Fetching a group and specifying refspecs does not make sense"));
result = fetch_multiple(&list);
} else { } else {
/* Zero or one remotes */ /* Zero or one remotes */
remote = remote_get(argv[0]); remote = remote_get(argv[0]);
result = fetch_one(remote, argc-1, argv+1); argc--;
argv++;
} }
} }
if (remote)
result = fetch_one(remote, argc, argv);
else
result = fetch_multiple(&list);
if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
struct argv_array options = ARGV_ARRAY_INIT; struct argv_array options = ARGV_ARRAY_INIT;