Merge branch 'jc/fetch-pack-fsck-objects'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:20 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:20 +0000 (12:36 -0700)
commitca0c9764bfe4f5d33551b5cca74eb0966f796baf
treeee63c84f0226d0443536ca9e00935b3c9877bb32
parentf817f2fbb5e3dbe49be446438838a11b192c2715
parentb10a53583f5725b796de630c946e41bbd48fcfe2
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
Documentation/config.txt
builtin/fetch-pack.c
builtin/receive-pack.c