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 94dc073,76169e3..15bb313
--- 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 b761150,00fb399..6d030b0
--- 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;