diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:20 -0700 |
| commit | ca0c9764bfe4f5d33551b5cca74eb0966f796baf (patch) | |
| tree | ee63c84f0226d0443536ca9e00935b3c9877bb32 /Documentation | |
| parent | Merge branch 'jc/traverse-commit-list' (diff) | |
| parent | test: fetch/receive with fsckobjects (diff) | |
| download | tgif-ca0c9764bfe4f5d33551b5cca74eb0966f796baf.tar.xz | |
Merge branch 'jc/fetch-pack-fsck-objects'
* jc/fetch-pack-fsck-objects:
test: fetch/receive with fsckobjects
transfer.fsckobjects: unify fetch/receive.fsckobjects
fetch.fsckobjects: verify downloaded objects
Conflicts:
Documentation/config.txt
builtin/fetch-pack.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0658ffb889..98bac55073 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -857,6 +857,13 @@ fetch.recurseSubmodules:: when its superproject retrieves a commit that updates the submodule's reference. +fetch.fsckObjects:: + If it is set to true, git-fetch-pack will check all fetched + objects. It will abort in the case of a malformed object or a + broken link. The result of an abort are only dangling objects. + Defaults to false. If not set, the value of `transfer.fsckObjects` + is used instead. + fetch.unpackLimit:: If the number of objects fetched over the git native transfer is below this @@ -1595,7 +1602,8 @@ receive.fsckObjects:: If it is set to true, git-receive-pack will check all received objects. It will abort in the case of a malformed object or a broken link. The result of an abort are only dangling objects. - Defaults to false. + Defaults to false. If not set, the value of `transfer.fsckObjects` + is used instead. receive.unpackLimit:: If the number of objects received in a push is below this @@ -1830,6 +1838,11 @@ tar.umask:: archiving user's umask will be used instead. See umask(2) and linkgit:git-archive[1]. +transfer.fsckObjects:: + When `fetch.fsckObjects` or `receive.fsckObjects` are + not set, the value of this variable is used instead. + Defaults to false. + transfer.unpackLimit:: When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. |