Skip to content

Commit

Permalink
Merge branch 'ds/bundle-uri-3' into seen
Browse files Browse the repository at this point in the history
* ds/bundle-uri-3:
  bundle-uri: fetch a list of bundles
  bundle-uri: limit recursion depth for bundle lists
  bundle-uri: parse bundle list in config format
  bundle-uri: unit test "key=value" parsing
  bundle-uri: create "key=value" line parsing
  bundle-uri: create base key-value pair parsing
  bundle-uri: create bundle_list struct and helpers
  • Loading branch information
gitster committed Aug 22, 2022
2 parents fbeacf4 + ba61c0e commit 5367958
Show file tree
Hide file tree
Showing 11 changed files with 889 additions and 13 deletions.
2 changes: 2 additions & 0 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,8 @@ include::config/branch.txt[]

include::config/browser.txt[]

include::config/bundle.txt[]

include::config/checkout.txt[]

include::config/clean.txt[]
Expand Down
22 changes: 22 additions & 0 deletions Documentation/config/bundle.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
bundle.*::
The `bundle.*` keys are used when communicating a list of bundle URIs
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.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,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
Expand Down
Loading

0 comments on commit 5367958

Please sign in to comment.