summaryrefslogtreecommitdiffstats
path: root/man5/gitformat-pack.5
diff options
context:
space:
mode:
Diffstat (limited to 'man5/gitformat-pack.5')
-rw-r--r--man5/gitformat-pack.520
1 files changed, 10 insertions, 10 deletions
diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5
index 5fad63ae3..b93426393 100644
--- a/man5/gitformat-pack.5
+++ b/man5/gitformat-pack.5
@@ -2,12 +2,12 @@
.\" Title: gitformat-pack
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2023-10-20
+.\" Date: 2023-10-23
.\" Manual: Git Manual
-.\" Source: Git 2.42.0.424.gceadf0f3cf
+.\" Source: Git 2.42.0.482.g2e8e77cbac
.\" Language: English
.\"
-.TH "GITFORMAT\-PACK" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual"
+.TH "GITFORMAT\-PACK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ $GIT_DIR/objects/pack/multi\-pack\-index
.sp
.SH "DESCRIPTION"
.sp
-The Git pack format is now Git stores most of its primary repository data\&. Over the lietime af a repository loose objects (if any) and smaller packs are consolidated into larger pack(s)\&. See \fBgit-gc\fR(1) and \fBgit-pack-objects\fR(1)\&.
+The Git pack format is how Git stores most of its primary repository data\&. Over the lifetime of a repository, loose objects (if any) and smaller packs are consolidated into larger pack(s)\&. See \fBgit-gc\fR(1) and \fBgit-pack-objects\fR(1)\&.
.sp
The pack format is also used over\-the\-wire, see e\&.g\&. \fBgitprotocol-v2\fR(5), as well as being a part of other container formats in the case of \fBgitformat-bundle\fR(5)\&.
.SH "CHECKSUMS AND OBJECT IDS"
@@ -111,7 +111,7 @@ more than 4G objects in a pack\&.
.sp -1
.IP \(bu 2.3
.\}
-The header is followed by number of object entries, each of which looks like this:
+The header is followed by a number of object entries, each of which looks like this:
.sp
.if n \{\
.RS 4
@@ -144,7 +144,7 @@ compressed delta data
.RS 4
.\}
.nf
-Observation: length of each object is encoded in a variable
+Observation: the length of each object is encoded in a variable
length format and is not constrained to 32\-bit or anything\&.
.fi
.if n \{\
@@ -246,7 +246,7 @@ Both ofs\-delta and ref\-delta store the "delta" to be applied to another object
.sp
The base object could also be deltified if it\(cqs in the same pack\&. 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\&.
.sp
-The delta data starts with the size of the base object and the size of the object to be reconstructed\&. These sizes are encoded using the size encoding from above\&. The remainder of the delta data is a sequence of instructions to reconstruct the object from the base object\&. If the base object is deltified, it must be converted to canonical form first\&. Each instruction appends more and more data to the target object until it\(cqs complete\&. There are two supported instructions so far: one for copy a byte range from the source object and one for inserting new data embedded in the instruction itself\&.
+The delta data starts with the size of the base object and the size of the object to be reconstructed\&. These sizes are encoded using the size encoding from above\&. The remainder of the delta data is a sequence of instructions to reconstruct the object from the base object\&. If the base object is deltified, it must be converted to canonical form first\&. Each instruction appends more and more data to the target object until it\(cqs complete\&. There are two supported instructions so far: one for copying a byte range from the source object and one for inserting new data embedded in the instruction itself\&.
.sp
Each instruction has variable length\&. Instruction type is determined by the seventh bit of the first octet\&. The following diagrams follow the convention in RFC 1951 (Deflate compressed data format)\&.
.sp
@@ -272,7 +272,7 @@ Each instruction has variable length\&. Instruction type is determined by the se
.sp
This is the instruction format to copy a byte range from the source object\&. It encodes the offset to copy from and the number of bytes to copy\&. Offset and size are in little\-endian order\&.
.sp
-All offset and size bytes are optional\&. This is to reduce the instruction size when encoding small offsets or sizes\&. The first seven bits in the first octet determines which of the next seven octets is present\&. If bit zero is set, offset1 is present\&. If bit one is set offset2 is present and so on\&.
+All offset and size bytes are optional\&. This is to reduce the instruction size when encoding small offsets or sizes\&. The first seven bits in the first octet determine which of the next seven octets is present\&. If bit zero is set, offset1 is present\&. If bit one is set offset2 is present and so on\&.
.sp
Note that a more compact instruction does not change offset and size encoding\&. For example, if only offset2 is omitted like below, offset3 still contains bits 16\-23\&. It does not become offset2 and contains bits 8\-15 even if it\(cqs right next to offset1\&.
.sp
@@ -311,7 +311,7 @@ In its most compact form, this instruction only takes up one byte (0x80) with bo
.RE
.\}
.sp
-This is the instruction to construct target object without the base object\&. The following data is appended to the target object\&. The first seven bits of the first octet determines the size of data in bytes\&. The size must be non\-zero\&.
+This is the instruction to construct the target object without the base object\&. The following data is appended to the target object\&. The first seven bits of the first octet determine the size of data in bytes\&. The size must be non\-zero\&.
.RE
.sp
.it 1 an-trap
@@ -607,7 +607,7 @@ The same trailer as a v1 pack file:
.RS 4
.\}
.nf
-A copy of the pack checksum at the end of
+A copy of the pack checksum at the end of the
corresponding packfile\&.
.fi
.if n \{\