aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-22 03:05:25 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-22 03:05:25 -0700
commitaa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1 (patch)
tree0e0149b07e2820d7518c514a316c24a0c6b9879e /Documentation/technical
parent605fac8b5bd6d4a2ca817631e2c56ba2d0a1ed91 (diff)
parent979ea5856cddace7223ddd715a448dbe49fcb290 (diff)
downloadgit-aa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1.tar.gz
git-aa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1.tar.xz
Merge branch 'maint'
* maint: Documentation/pack-format.txt: Clear up description of types. fix typo in git-am manpage
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/pack-format.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt
index 0e1ffb242..9ce3c473a 100644
--- a/Documentation/technical/pack-format.txt
+++ b/Documentation/technical/pack-format.txt
@@ -21,11 +21,11 @@ GIT pack format
which looks like this:
(undeltified representation)
- n-byte type and length (4-bit type, (n-1)*7+4-bit length)
+ n-byte type and length (3-bit type, (n-1)*7+4-bit length)
compressed data
(deltified representation)
- n-byte type and length (4-bit type, (n-1)*7+4-bit length)
+ n-byte type and length (3-bit type, (n-1)*7+4-bit length)
20-byte base object name
compressed delta data
@@ -102,11 +102,13 @@ trailer | | packfile checksum |
Pack file entry: <+
packed object header:
- 1-byte type (upper 4-bit)
+ 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 most significant part.
+ 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).