Merge branch 'jc/fsck-fixes' into maint
commitb76bf72428e2efd978fee421606662e78ba0b2cf
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Feb 2011 22:26:10 +0000 (11 14:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Feb 2011 22:26:10 +0000 (11 14:26 -0800)
treeb4a5a2769d3639468e2a4aea83d1ba895de553ca
parent3446a54c9afe3f78ca27fc51f618884ba49493de
parentea6f0a23ac63b3a19202db5441704e3d79236ad4
Merge branch 'jc/fsck-fixes' into maint

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