From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, jonathantanmy@google.com
Subject: [PATCH v5 03/14] fetch: refactor calculation of remote list
Date: Tue, 21 Nov 2017 21:15:17 +0000 [thread overview]
Message-ID: <20171121211528.21891-4-git@jeffhostetler.com> (raw)
In-Reply-To: <20171121211528.21891-1-git@jeffhostetler.com>
From: Jonathan Tan <jonathantanmy@google.com>
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>
---
builtin/fetch.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 225c734..1b1f039 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1322,7 +1322,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
{
int i;
struct string_list list = STRING_LIST_INIT_DUP;
- struct remote *remote;
+ struct remote *remote = NULL;
int result = 0;
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)
die(_("fetch --all does not make sense with refspecs"));
(void) for_each_remote(get_one_remote_for_fetch, &list);
- result = fetch_multiple(&list);
} else if (argc == 0) {
/* No arguments -- use default remote */
remote = remote_get(NULL);
- result = fetch_one(remote, argc, argv);
} else if (multiple) {
/* All arguments are assumed to be remotes or groups */
for (i = 0; i < argc; i++)
if (!add_remote_or_group(argv[i], &list))
die(_("No such remote or remote group: %s"), argv[i]);
- result = fetch_multiple(&list);
} else {
/* Single remote or group */
(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 */
if (argc > 1)
die(_("Fetching a group and specifying refspecs does not make sense"));
- result = fetch_multiple(&list);
} else {
/* Zero or one remotes */
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)) {
struct argv_array options = ARGV_ARRAY_INIT;
--
2.9.3
next prev parent reply other threads:[~2017-11-21 21:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 21:15 [PATCH v5 00/14] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 01/14] upload-pack: add object filtering for partial clone Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 02/14] clone, fetch-pack, index-pack, transport: " Jeff Hostetler
2017-11-21 21:15 ` Jeff Hostetler [this message]
2017-11-21 21:15 ` [PATCH v5 04/14] fetch: add object filtering for partial fetch Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 05/14] remote-curl: add object filtering for partial clone Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 06/14] pack-objects: test support for blob filtering Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 07/14] fetch-pack: test support excluding large blobs Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 08/14] partial-clone: define partial clone settings in config Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 09/14] fetch: add from_promisor and exclude-promisor-objects parameters Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 10/14] t5500: add fetch-pack tests for partial clone Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 11/14] t5601: test " Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 12/14] t5500: more tests for partial clone and fetch Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 13/14] unpack-trees: batch fetching of missing blobs Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 14/14] fetch-pack: restore save_commit_buffer after use Jeff Hostetler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171121211528.21891-4-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).