From: Derrick Stolee <derrickstolee@xxxxxxxxxx>
The 'uri' parameter of fetch_bundle_list() was added early in
development, but is not required since the 'list' parameter includes a
'baseURI' member. Remove the 'uri' parameter and make this expectation
explicit.
Signed-off-by: Derrick Stolee <derrickstolee@xxxxxxxxxx>
---
builtin/clone.c | 1 -
bundle-uri.c | 2 +-
bundle-uri.h | 8 ++++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 12fb527d7bb..430b2e981e3 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -1284,7 +1284,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (repo_init(the_repository, git_dir, work_tree))
warning(_("failed to initialize the repo, skipping bundle URI"));
else if (fetch_bundle_list(the_repository,
- remote->url[0],
transport->bundles))
warning(_("failed to fetch advertised bundles"));
} else {
diff --git a/bundle-uri.c b/bundle-uri.c
index c411b871bdd..8efb4e7acad 100644
--- a/bundle-uri.c
+++ b/bundle-uri.c
@@ -577,7 +577,7 @@ cleanup:
return result;
}
-int fetch_bundle_list(struct repository *r, const char *uri, struct bundle_list *list)
+int fetch_bundle_list(struct repository *r, struct bundle_list *list)
{
int result;
struct bundle_list global_list;
diff --git a/bundle-uri.h b/bundle-uri.h
index b2c9c160a52..29b0c98ee65 100644
--- a/bundle-uri.h
+++ b/bundle-uri.h
@@ -68,8 +68,8 @@ struct bundle_list {
* In the case of the 'bundle-uri' protocol v2 command, the base
* URI is the URI of the Git remote.
*
- * Otherewise, the bundle list was downloaded over HTTP from some
- * known URI.
+ * Otherwise, the bundle list was downloaded over HTTP from some
+ * known URI. 'baseURI' is set to that value.
*
* The baseURI is used as the base for any relative URIs
* advertised by the bundle list at that location.
@@ -112,10 +112,10 @@ int fetch_bundle_uri(struct repository *r, const char *uri);
* bundle-uri protocol v2 verb) at the given uri, fetch and unbundle the
* bundles according to the bundle strategy of that list.
*
- * Returns non-zero if no bundle information is found at the given 'uri'.
+ * It is expected that the given 'list' is initialized, including its
+ * 'baseURI' value.
*/
int fetch_bundle_list(struct repository *r,
- const char *uri,
struct bundle_list *list);
/**
--
gitgitgadget
