From: Junio C Hamano <junkio@cox.net>
Date: Fri, 28 Apr 2006 04:38:43 +0000 (-0700)
Subject: Merge branch 'jc/count' into next
X-Git-Tag: v1.4.1-rc1~168
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac92095ff2c47731ba9a2a7779cd797b973ffc74;p=git.git

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.
---

ac92095ff2c47731ba9a2a7779cd797b973ffc74
diff --cc builtin.h
index 94dc0732f,76169e3f0..15bb313ee
--- a/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 b761150c2,00fb39972..6d030b01c
--- a/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;