Merge branch 'mk/maint-parse-careful'
commiteadbcd498a18d60467883aeb6c0726048e7382a2
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:11:07 +0000 (2 15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:11:07 +0000 (2 15:11 -0800)
tree50e765722a06a56121c6431d47cd319a2594ae71
parentc42f63671c0f09cba0c8247c4d1d8121f37798fe
parent28f72a0f232dfc71b3be726e7e71d0a6d5f9ebba
Merge branch 'mk/maint-parse-careful'

* mk/maint-parse-careful:
  receive-pack: use strict mode for unpacking objects
  index-pack: introduce checking mode
  unpack-objects: prevent writing of inconsistent objects
  unpack-object: cache for non written objects
  add common fsck error printing function
  builtin-fsck: move common object checking code to fsck.c
  builtin-fsck: reports missing parent commits
  Remove unused object-ref code
  builtin-fsck: move away from object-refs to fsck_walk
  add generic, type aware object chain walker

Conflicts:

Makefile
builtin-fsck.c
12 files changed:
Documentation/config.txt
Makefile
builtin-fetch-pack.c
builtin-fsck.c
builtin-pack-objects.c
builtin-rev-list.c
cache.h
commit.h
receive-pack.c
tag.c
tree.c
upload-pack.c