From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:20 +0000 (-0700)
Subject: Merge branch 'jc/fetch-pack-fsck-objects'
X-Git-Tag: v1.7.8-rc0~139
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ca0c9764bfe4f5d33551b5cca74eb0966f796baf;p=git.git

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
---

ca0c9764bfe4f5d33551b5cca74eb0966f796baf
diff --cc Documentation/config.txt
index 0658ffb88,d944403f7..98bac5507
--- a/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 412bd327b,dac3038e9..c8bf9b85b
--- a/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",
  };