From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 06:40:39 +0000 (-0700)
Subject: Merge branch 'jc/count'
X-Git-Tag: v1.4.0-rc1~186
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d820f918711446a74cc74577f6f2535a78752708;p=git.git

Merge branch 'jc/count'

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

d820f918711446a74cc74577f6f2535a78752708
diff --cc Makefile
index 9cb40a81,f1592fb6..67559c9f
--- a/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 94fa9b54,76169e3f..dca69632
--- a/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 fd479e97,00fb3997..4d3a5a30
--- 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 },
 +		{ "push", cmd_push },
+ 		{ "count-objects", cmd_count_objects },
  	};
  	int i;