diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-01 14:02:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-01 14:02:57 -0800 |
| commit | 6ee353d42f389ec9454161b64ffbeb4167edebaa (patch) | |
| tree | 408986aa58c00c86025845ff01d7475a9333f933 /Documentation/git-index-pack.txt | |
| parent | 660dd97a62da66ffe95df20a9e27a01e39ae473f (diff) | |
| parent | 5476e1efded571e374cd97c7d69f17962ba1c44f (diff) | |
| download | git-6ee353d42f389ec9454161b64ffbeb4167edebaa.tar.gz | |
Merge branch 'jt/transfer-fsck-across-packs'
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* jt/transfer-fsck-across-packs:
fetch-pack: print and use dangling .gitmodules
fetch-pack: with packfile URIs, use index-pack arg
http-fetch: allow custom index-pack args
http: allow custom index-pack args
Diffstat (limited to 'Documentation/git-index-pack.txt')
| -rw-r--r-- | Documentation/git-index-pack.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt index 69ba904d44..7fa74b9e79 100644 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.txt @@ -86,7 +86,12 @@ OPTIONS Die if the pack contains broken links. For internal use only. --fsck-objects:: - Die if the pack contains broken objects. For internal use only. + For internal use only. ++ +Die if the pack contains broken objects. If the pack contains a tree +pointing to a .gitmodules blob that does not exist, prints the hash of +that blob (for the caller to check) after the hash that goes into the +name of the pack/idx file (see "Notes"). --threads=<n>:: Specifies the number of threads to spawn when resolving |