Merge branch 'jc/fsck-fixes' into next
commit98e1c63f670e9b6d0b1410a336a866617d9ac083
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800)
tree1d4ca4ec4e295a64141ca7b8f6f73611ebc2495c
parentd3466655d2885e3e0edbf8f48e35c183bc95c3af
parentea6f0a23ac63b3a19202db5441704e3d79236ad4
Merge branch 'jc/fsck-fixes' into next

* jc/fsck-fixes:
  fsck: do not give up too early in fsck_dir()
  fsck: drop unused parameter from traverse_one_object()