Bundle URIs Part 3: Fetch a list of bundles

Documentation/config.txt

@@ -387,6 +387,8 @@ include::config/branch.txt[]
 
 include::config/browser.txt[]
 
+include::config/bundle.txt[]
+
 include::config/checkout.txt[]
 
 include::config/clean.txt[]

Documentation/config/bundle.txt

@@ -0,0 +1,24 @@
+bundle.*::
+The `bundle.*` keys may appear in a bundle list file found via the
+`git clone --bundle-uri` option. These keys currently have no effect
+if placed in a repository config file, though this will change in the
+future. See link:technical/bundle-uri.html[the bundle URI design
+document] for more details.
+
+bundle.version::
+This integer value advertises the version of the bundle list format
+used by the bundle list. Currently, the only accepted value is `1`.
+
+bundle.mode::
+This string value should be either `all` or `any`. This value describes
+whether all of the advertised bundles are required to unbundle a
+complete understanding of the bundled information (`all`) or if any one
+of the listed bundle URIs is sufficient (`any`).
+
+bundle.<id>.*::
+The `bundle.<id>.*` keys are used to describe a single item in the
+bundle list, grouped under `<id>` for identification purposes.
+
+bundle.<id>.uri::
+This string value defines the URI by which Git can reach the contents
+of this `<id>`. This URI may be a bundle file or another bundle list.

Makefile

@@ -722,6 +722,7 @@ PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 TEST_BUILTINS_OBJS += test-advise.o
 TEST_BUILTINS_OBJS += test-bitmap.o
 TEST_BUILTINS_OBJS += test-bloom.o
+TEST_BUILTINS_OBJS += test-bundle-uri.o
 TEST_BUILTINS_OBJS += test-chmtime.o
 TEST_BUILTINS_OBJS += test-config.o
 TEST_BUILTINS_OBJS += test-crontab.o

builtin/bundle.c

@@ -119,7 +119,8 @@ static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) {
 goto cleanup;
 }
 close(bundle_fd);
-if (verify_bundle(the_repository, &header, !quiet)) {
+if (verify_bundle(the_repository, &header,
+ quiet ? VERIFY_BUNDLE_QUIET : VERIFY_BUNDLE_VERBOSE)) {
 ret = 1;
 goto cleanup;
 }
@@ -185,7 +186,7 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix)
 strvec_pushl(&extra_index_pack_args, "-v", "--progress-title",
  _("Unbundling objects"), NULL);
 ret = !!unbundle(the_repository, &header, bundle_fd,
- &extra_index_pack_args) ||
+ &extra_index_pack_args, 0) ||
 list_bundle_refs(&header, argc, argv);
 bundle_header_release(&header);
 cleanup: