Merge branch 'np/verify-pack'

* np/verify-pack:
  add storage size output to 'git verify-pack -v'
  fix unimplemented packed_object_info_detail() features
  make verify_one_pack() a bit less wrong wrt packed_git structure
  factorize revindex code out of builtin-pack-objects.c

Conflicts:

	Makefile

diff --cc Makefile
index 71f01d16b1a42d366b04f1fce621db4dac6b1976,1acac027667b89b90235d2873652b01c991b952f..ca5aad963ca7b5565338f49ce1705c451216c8be
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -304,7 -304,8 +304,8 @@@ LIB_H = 
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
        tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
        utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
-       mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h
 -      mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h \
++      mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h \
+       pack-revindex.h
  
  DIFF_OBJS = \
        diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -328,7 -329,7 +329,7 @@@ LIB_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 branch.o \
-       alias.o fsck.o
 -      alias.o pack-revindex.o
++      alias.o fsck.o pack-revindex.o
  
  BUILTIN_OBJS = \
        builtin-add.o \

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