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

diff --cc Documentation/config.txt
index 0658ffb889320d408f2cad9214e138879059c766,d944403f7ebb24c46b92c4d3ffc78fcee74cf401..98bac550736f5fd54032371c7f8acbcc8730116c
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -848,15 -820,13 +848,22 @@@ diff.wordRegex:
        sequences that match the regular expression are "words", all other
        characters are *ignorable* whitespace.
  
 +fetch.recurseSubmodules::
 +      This option can be either set to a boolean value or to 'on-demand'.
 +      Setting it to a boolean changes the behavior of fetch and pull to
 +      unconditionally recurse into submodules when set to true or to not
 +      recurse at all when set to false. When set to 'on-demand' (the default
 +      value), fetch and pull will only recurse into a populated submodule
 +      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

diff --cc builtin/fetch-pack.c
index 412bd327b5b396c159c768b25be189e00531c38e,dac3038e908762b6558d8a73e7d2b598e44cb085..c8bf9b85b07690dce8af5e093e02994ae5c510be
--- 1/builtin/fetch-pack.c
--- 2/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@@ -15,7 -14,8 +15,9 @@@ static int transfer_unpack_limit = -1
  static int fetch_unpack_limit = -1;
  static int unpack_limit = 100;
  static int prefer_ofs_delta = 1;
- static int no_done = 0;
++static int no_done;
+ static int fetch_fsck_objects = -1;
+ static int transfer_fsck_objects = -1;
  static struct fetch_pack_args args = {
        /* .uploadpack = */ "git-upload-pack",
  };

diff --cc builtin/receive-pack.c
Simple merge