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.lorimer.id.au/gitweb.git/diff_plain/ac92095ff2c47731ba9a2a7779cd797b973ffc74?hp=-c

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 --combined Makefile
index d2cc01a265,14193aa1e2..4416af9bb0
--- a/Makefile
+++ b/Makefile
@@@ -204,7 -204,7 +204,7 @@@ DIFF_OBJS = 
  	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o csum-file.o \
 +	blob.o commit.o connect.o csum-file.o cache-tree.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o \
  	quote.o read-cache.o refs.o run-command.o \
@@@ -214,7 -214,7 +214,7 @@@
  	$(DIFF_OBJS)
  
  BUILTIN_OBJS = \
- 	builtin-log.o builtin-help.o
+ 	builtin-log.o builtin-help.o builtin-count.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -611,9 -611,6 +611,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
diff --combined builtin.h
index 94dc0732f9,76169e3f05..15bb313ee2
--- 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 --combined git.c
index b761150c29,00fb399725..6d030b01cc
--- 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;