Skip to content

Commit d6010ce

Browse files
committed
Merge branch 'ds/bundle-uri-3' into seen
Define the logical elements of a "bundle list", data structure to store them in-core, format to transfer them, and code to parse them. source: <[email protected]> * 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
2 parents 013bd2d + 5ea85c9 commit d6010ce

File tree

11 files changed

+889
-13
lines changed

11 files changed

+889
-13
lines changed

Documentation/config.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ include::config/branch.txt[]
387387

388388
include::config/browser.txt[]
389389

390+
include::config/bundle.txt[]
391+
390392
include::config/checkout.txt[]
391393

392394
include::config/clean.txt[]

Documentation/config/bundle.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
bundle.*::
2+
The `bundle.*` keys are used when communicating a list of bundle URIs
3+
See link:technical/bundle-uri.html[the bundle URI design document] for
4+
more details.
5+
6+
bundle.version::
7+
This integer value advertises the version of the bundle list format
8+
used by the bundle list. Currently, the only accepted value is `1`.
9+
10+
bundle.mode::
11+
This string value should be either `all` or `any`. This value describes
12+
whether all of the advertised bundles are required to unbundle a
13+
complete understanding of the bundled information (`all`) or if any one
14+
of the listed bundle URIs is sufficient (`any`).
15+
16+
bundle.<id>.*::
17+
The `bundle.<id>.*` keys are used to describe a single item in the
18+
bundle list, grouped under `<id>` for identification purposes.
19+
20+
bundle.<id>.uri::
21+
This string value defines the URI by which Git can reach the contents
22+
of this `<id>`. This URI may be a bundle file or another bundle list.

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
718718
TEST_BUILTINS_OBJS += test-advise.o
719719
TEST_BUILTINS_OBJS += test-bitmap.o
720720
TEST_BUILTINS_OBJS += test-bloom.o
721+
TEST_BUILTINS_OBJS += test-bundle-uri.o
721722
TEST_BUILTINS_OBJS += test-chmtime.o
722723
TEST_BUILTINS_OBJS += test-config.o
723724
TEST_BUILTINS_OBJS += test-crontab.o

0 commit comments

Comments
 (0)