Merge branch 'jc/count'

* jc/count:
  builtin-count-objects: open packs when running -v
  builtin-count-objects: make it official.
  built-in count-objects.

diff --cc Makefile
index 9cb40a8,f1592fb..67559c9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -115,10 -115,10 +115,10 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  SCRIPT_SH = \
        git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
        git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
-       git-count-objects.sh git-diff.sh git-fetch.sh \
+       git-diff.sh git-fetch.sh \
        git-format-patch.sh git-ls-remote.sh \
        git-merge-one-file.sh git-parse-remote.sh \
 -      git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
 +      git-prune.sh git-pull.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \
        git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \
        git-tag.sh git-verify-tag.sh git-whatchanged.sh \
@@@ -168,7 -168,7 +168,7 @@@ PROGRAMS = 
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
  BUILT_INS = git-log$X \
-       git-push$X
 -      git-count-objects$X
++      git-count-objects$X git-push$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -215,7 -215,7 +215,7 @@@ LIB_OBJS = 
        $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o builtin-push.o
 -      builtin-log.o builtin-help.o builtin-count.o
++      builtin-log.o builtin-help.o builtin-count.o builtin-push.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz

diff --cc builtin.h
index 94fa9b5,76169e3..dca6963
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -19,7 -19,6 +19,8 @@@ 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_count_objects(int argc, const char **argv, char **envp);
  
 +extern int cmd_push(int argc, const char **argv, char **envp);
 +
  #endif

diff --cc git.c
index fd479e9,00fb399..4d3a5a3
--- 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 },
 +              { "push", cmd_push },
+               { "count-objects", cmd_count_objects },
        };
        int i;