Skip to content

Commit

Permalink
config doc: don't describe *.fetchObjects twice
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
avar authored and gitster committed Jul 27, 2018
1 parent 95d9d4b commit 5180dd2
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5180dd2

Please sign in to comment.