Merge branch 'mk/maint-parse-careful'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:11:07 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:11:07 +0000 (15:11 -0800)
* 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:
1  2 
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

Simple merge
diff --cc 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 \
Simple merge
diff --cc builtin-fsck.c
Simple merge
Simple merge
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