Merge branch 'jc/count' into next

* jc/count:
built-in count-objects.
pack-objects: update size heuristucs.
verify-pack: check integrity in a saner order.

diff --combined Makefile
index d2cc01a265d1ed5ccb7ac28a7afd025d4b76321e,14193aa1e20568f22e53cf73b1ba3e5fba08d74b..4416af9bb05c710cf6577540f6f1edc94c93604b
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -204,7 -204,7 +204,7 @@@ DIFF_OBJS = 
        diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -      blob.o commit.o connect.o csum-file.o \
 +      blob.o commit.o connect.o csum-file.o cache-tree.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
        quote.o read-cache.o refs.o run-command.o \
@@@ -214,7 -214,7 +214,7 @@@
        $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o
+       builtin-log.o builtin-help.o builtin-count.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -611,9 -611,6 +611,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +      $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
        for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  

diff --combined builtin.h
index 94dc0732f9f42069f375673ce1b26aa0b43c26e6,76169e3f053533893558d56f85fd93e46098a0be..15bb313ee26a21db06ca17fa09d4d31c27ecb07f
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -19,6 -19,6 +19,7 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, char **envp);
  extern int cmd_show(int argc, const char **argv, char **envp);
  extern int cmd_log(int argc, const char **argv, char **envp);
 +extern int cmd_format_patch(int argc, const char **argv, char **envp);
+ extern int cmd_count_objects(int argc, const char **argv, char **envp);
  
  #endif

diff --combined git.c
index b761150c29eaee5e1faf102e27a08f87c831aa64,00fb39972578248fd0aeee50c9e950c91f8ea148..6d030b01cc6b9a884b68573124e06787f7beb61c
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -46,7 -46,7 +46,8 @@@ static void handle_internal_command(in
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
 +              { "fmt-patch", cmd_format_patch },
+               { "count-objects", cmd_count_objects },
        };
        int i;