"Alba Mendez via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > 4-byte version number (network byte order): > - Git currently accepts version number 2 or 3 but > + Git currently accepts version number 2 or 3 but > generates version 2 only. Hmph, what is this hunk about? > - (undeltified representation) > - n-byte type and length (3-bit type, (n-1)*7+4-bit length) > - compressed data > - > - (deltified representation) > - n-byte type and length (3-bit type, (n-1)*7+4-bit length) > - 20-byte base object name if OBJ_REF_DELTA or a negative relative > - offset from the delta object's position in the pack if this > - is an OBJ_OFS_DELTA object > - compressed delta data > + packed object header: > + 1-byte size extension bit (MSB) > + type (next 3-bit) > + size0 (lower 4-bit) > + n-byte sizeN (as long as MSB is set, each 7-bit) > + size0..sizeN form 4+7+7+..+7 bit integer, size0 > + is the least significant part, and sizeN is the > + most significant part. > + packed object data: > + If it is not DELTA, then deflated bytes (the > + size above is the size before compression). Correct. > + If it is REF_DELTA, then > + 20-byte base object name SHA-1. > + deflated delta data (the size above is the > + size of this data before compression). Correct. > + If it is OFS_DELTA, then > + n-byte offset (see below) interpreted as a > + negative offset from the type-byte of > + the header of the ofs-delta entry. Correct, and "see below" here is very important. > + deflated delta data (the size above is the > + size of this data before compression). > + offset encoding: > + n bytes with MSB set in all but the last one. > + The offset is then the number constructed by > + concatenating the lower 7 bit of each byte, and > + for n >= 2 adding 2^7 + 2^14 + ... + 2^(7*(n-1)) > + to the result. Correct. Shouldn't we have a similar explanation for the object length varint above (in other words, how 4+7+7+..+7 bits are combined to form an integer)? > @@ -67,7 +82,9 @@ Ref-delta can also refer to an object outside the pack (i.e. the > so-called "thin pack"). When stored on disk however, the pack should > be self contained to avoid cyclic dependency. > > -The delta data is a sequence of instructions to reconstruct an object > +The deflated delta data begins with two n-byte sizes: the size of > +the base object data, and the size of the reconstructed object data. Similarly, not just "n-byte size", but clarify that this is a pair of "varint" and specify which kind of "varint" it is (IIRC, this encoding did not use the "save-one-bit" trick the offset encoding uses). > @@ -186,36 +203,6 @@ trailer | | packfile checksum | > | > Pack file entry: <+ > > - packed object header: > - 1-byte size extension bit (MSB) > - type (next 3 bit) > - size0 (lower 4-bit) > - n-byte sizeN (as long as MSB is set, each 7-bit) > - size0..sizeN form 4+7+7+..+7 bit integer, size0 > - is the least significant part, and sizeN is the > - most significant part. > - packed object data: > - If it is not DELTA, then deflated bytes (the size above > - is the size before compression). > - If it is REF_DELTA, then > - 20-byte base object name SHA-1 (the size above is the > - size of the delta data that follows). > - delta data, deflated. > - If it is OFS_DELTA, then > - n-byte offset (see below) interpreted as a negative > - offset from the type-byte of the header of the > - ofs-delta entry (the size above is the size of > - the delta data that follows). > - delta data, deflated. > - > - offset encoding: > - n bytes with MSB set in all but the last one. > - The offset is then the number constructed by > - concatenating the lower 7 bit of each byte, and > - for n >= 2 adding 2^7 + 2^14 + ... + 2^(7*(n-1)) > - to the result. > - > - Hmph, I kept saying "Correct" above, but it seems that the correctness come from the original. So, why is this patch so big? As far as I can tell, the only thing it improved (content-wise) was to say that the delta data has two varints that lets reader to validate the length of the original contents that the delta applies to, and to allocate the buffer to hold the result before applying the delta. Puzzled. Thanks.
