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.

1 files changed, 1 insertions, 0 deletions

diff --git a/git.c b/git.c
index b761150c29..6d030b01cc 100644
--- a/git.c
+++ b/git.c
@@ -47,6 +47,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "whatchanged", cmd_whatchanged },
 		{ "show", cmd_show },
 		{ "fmt-patch", cmd_format_patch },
+		{ "count-objects", cmd_count_objects },
 	};
 	int i;