diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-07-27 14:37:12 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-27 11:36:05 -0700 |
| commit | 5180dd2e9ffb46eb02ee24439f2cd24a534d2954 (patch) | |
| tree | 4d2d3eec8e956343f96e971b33cca2bbfbf5b5a6 | |
| parent | receive.fsck.<msg-id> tests: remove dead code (diff) | |
| download | tgif-5180dd2e9ffb46eb02ee24439f2cd24a534d2954.tar.xz | |
config doc: don't describe *.fetchObjects twice
Refer readers of fetch.fsckObjects and receive.fsckObjects to
transfer.fsckObjects instead of repeating the description at each
location.
I don't think this description of them makes much sense, but for now
I'm just moving the existing documentation around. Making it better
will be done in a later patch.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 43b2de7b5f..6b99cf8d71 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1463,10 +1463,9 @@ fetch.recurseSubmodules:: 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. + objects. See `transfer.fsckObjects` for what's + checked. 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 @@ -2889,10 +2888,9 @@ receive.certNonceSlop:: 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. If not set, the value of `transfer.fsckObjects` - is used instead. + objects. See `transfer.fsckObjects` for what's checked. + Defaults to false. If not set, the value of + `transfer.fsckObjects` is used instead. receive.fsck.<msg-id>:: When `receive.fsckObjects` is set to true, errors can be switched @@ -3389,6 +3387,10 @@ transfer.fsckObjects:: When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of this variable is used instead. Defaults to false. ++ +When set, the fetch or receive will abort in the case of a malformed +object or a broken link. The result of an abort are only dangling +objects. transfer.hideRefs:: String(s) `receive-pack` and `upload-pack` use to decide which |