On Tue, May 8, 2018 at 8:56 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: > The current document mentions OBJ_* constants without their actual > values. A git developer would know these are from cache.h but that's > not very friendly to a person who wants to read this file to implement > a pack file parser. > > Similarly, the deltified representation is not documented at all (the > "document" is basically patch-delta.c). Translate that C code in > English. > > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > I noticed that these object type values are not documented in > pack-format.txt so here's my attempt to improve it. Thanks for sending this patch! > > While at there, I also add some text about this obscure delta format. > We occasionally have questions about this on the mailing list if I > remember correctly. Let me see if I can understand it, as I am not well versed in the delta format, so ideally I would understand it from the patch here? > > Documentation/technical/pack-format.txt | 41 +++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) > > diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt > index 8e5bf60be3..2c7d5c0e74 100644 > --- a/Documentation/technical/pack-format.txt > +++ b/Documentation/technical/pack-format.txt > @@ -36,6 +36,47 @@ Git pack format > > - The trailer records 20-byte SHA-1 checksum of all of the above. > > +Valid object types are: > + > +- OBJ_COMMIT (1) > +- OBJ_TREE (2) > +- OBJ_BLOB (3) > +- OBJ_TAG (4) > +- OBJ_OFS_DELTA (6) > +- OBJ_REF_DELTA (7) > + > +Type 5 is reserved for future expansion. and type 0 as well, but that is not spelled out? > +Deltified representation Does this refer to OFS delta as well as REF deltas? > is a sequence of one byte command optionally > +followed by more data for the command. The following commands are > +recognized: So a Deltified representation of an object is a 6 or 7 in the 3 bit type and then the length. Then a command is shown how to construct the object based on other objects. Can there be more commands? > +- If bit 7 is set, the remaining bits in the command byte specifies > + how to extract copy offset and size to copy. The following must be > + evaluated in this exact order: So there are 2 modes, and the high bit indicates which mode is used. You start describing the more complicated mode first, maybe give names to both of them? "direct copy" (below) and "compressed copy with offset" ? > + - If bit 0 is set, the following byte contains bits 0-7 of the copy > + offset (this also resets all other bits in the copy offset to > + zero). > + - If bit 1 is set, the following byte contains bits 8-15 of the copy > + offset. > + - If bit 2 is set, the following byte contains bits 16-23 of the > + copy offset. > + - If bit 3 is set, the following byte contains bits 24-31 of the > + copy offset. I assume these bits are exclusive, i.e. if bit 3 is set, bits 0-2 are not allowed to be set. What happens if they are set, do we care? If bit 3 is set, then the following byte contains 24-31 of the copy offset, where is the rest? Do I wait for another command byte with bits 2,1,0 to learn about the body offsets, or do they follow the following byte? Something like: "If bit 3 is set, then the next 4 bytes are the copy offset, in network byte order" > + - If bit 4 is set, the following byte contains bits 0-7 of the copy > + size (this also resets all other bits in the copy size to zero_. > + - If bit 5 is set, the following byte contains bits 8-15 of the copy > + size. > + - If bit 6 is set, the following byte contains bits 16-23 of the > + copy size. bits 4-7 seem to be another group of mutually exclusive bits. The same question as above: If bit 6 is set, where are bits 0-15 of the copy size? > + > + Copy size zero means 0x10000 bytes. This is an interesting caveat. So we can only copy 1-0x10000 bytes, and cannot express to copy 0 bytes? > The data from source object at > + the given copy offset is copied back to the destination buffer. > + > +- If bit 7 is not set, it is the copy size in bytes. The following > + bytes are copied to destination buffer > +- Command byte zero is reserved for future expansion. Thanks, Stefan
