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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 43b2de7b5fe21bffb623ccf8aba286c346440d51..6b99cf8d7166fa905c818a314cf8dd16a64e681c 100644 (file)
--- 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
 
 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
 
 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
 
 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
 
 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 `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
 
 transfer.hideRefs::
        String(s) `receive-pack` and `upload-pack` use to decide which