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

diff --cc Documentation/config.txt
Simple merge

diff --cc Makefile
index c2f84a76f62171fe32ffe1770a10721f516f8169,8ff0c772f1f21e230f08175c2aff704b507e64b9..71f01d16b1a42d366b04f1fce621db4dac6b1976
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -327,8 -320,7 +327,8 @@@ LIB_OBJS = 
        alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
        color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
        convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \
 -      transport.o bundle.o walker.o parse-options.o ws.o archive.o fsck.o
 +      transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \
-       alias.o
++      alias.o fsck.o
  
  BUILTIN_OBJS = \
        builtin-add.o \

diff --cc builtin-fetch-pack.c
Simple merge

diff --cc builtin-fsck.c
Simple merge

diff --cc builtin-pack-objects.c
Simple merge

diff --cc builtin-rev-list.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc commit.h
Simple merge

diff --cc receive-pack.c
Simple merge

diff --cc tag.c
Simple merge

diff --cc tree.c
Simple merge

diff --cc upload-pack.c
Simple merge