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 --cc Makefile
Simple merge

diff --cc 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 --cc 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;