diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-13 14:13:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-13 14:13:39 -0700 |
commit | d1a8a8979d61a889b915dca36aea9c2a88d0f3f7 (patch) | |
tree | 02eece403714ca30f78b50c485e323db0ab44b97 /Documentation | |
parent | Merge branch 'bc/sha-256-cvs-svn-updates' (diff) | |
parent | fsck: do not lazy fetch known non-promisor object (diff) | |
download | tgif-d1a8a8979d61a889b915dca36aea9c2a88d0f3f7.tar.xz |
Merge branch 'jt/has_object'
A new helper function has_object() has been introduced to make it
easier to mark object existence checks that do and don't want to
trigger lazy fetches, and a few such checks are converted using it.
* jt/has_object:
fsck: do not lazy fetch known non-promisor object
pack-objects: no fetch when allow-{any,promisor}
apply: do not lazy fetch when applying binary
sha1-file: introduce no-lazy-fetch has_object()
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-pack-objects.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index eaa2f2a404..54d715ead1 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -270,15 +270,18 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle. This option specifies how missing objects are handled. + The form '--missing=error' requests that pack-objects stop with an error if -a missing object is encountered. This is the default action. +a missing object is encountered. If the repository is a partial clone, an +attempt to fetch missing objects will be made before declaring them missing. +This is the default action. + The form '--missing=allow-any' will allow object traversal to continue -if a missing object is encountered. Missing objects will silently be -omitted from the results. +if a missing object is encountered. No fetch of a missing object will occur. +Missing objects will silently be omitted from the results. + The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. -Unexpected missing object will raise an error. +No fetch of a missing object will occur. An unexpected missing object will +raise an error. --exclude-promisor-objects:: Omit objects that are known to be in the promisor remote. (This |