From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Mar 2008 23:11:07 +0000 (-0800)
Subject: Merge branch 'mk/maint-parse-careful'
X-Git-Tag: v1.5.5-rc0~93
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eadbcd498a18d60467883aeb6c0726048e7382a2;p=git.git

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
---

eadbcd498a18d60467883aeb6c0726048e7382a2
diff --cc Makefile
index c2f84a76f,8ff0c772f..71f01d16b
--- a/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 \