From: Junio C Hamano <junkio@cox.net>
Date: Tue, 2 May 2006 06:18:09 +0000 (-0700)
Subject: Merge branch 'jc/count' into next
X-Git-Tag: v1.4.1-rc1~152
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a9fb5823236e675165cd91f3651094c967be532e?hp=-c

Merge branch 'jc/count' into next

* jc/count:
builtin-count-objects: make it official.
---

a9fb5823236e675165cd91f3651094c967be532e
diff --combined Makefile
index ef1c36ea25,f1592fb6ef..bf800b143f
--- a/Makefile
+++ b/Makefile
@@@ -115,13 -115,13 +115,13 @@@ 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-fetch.sh \
 -	git-diff.sh git-fetch.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-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 \
 +	git-tag.sh git-verify-tag.sh \
  	git-applymbox.sh git-applypatch.sh git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
  	git-merge-resolve.sh git-merge-ours.sh git-grep.sh \
@@@ -139,7 -139,7 +139,7 @@@ SCRIPT_PYTHON = 
  SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
  	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
  	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
 -	  git-cherry-pick git-show git-status
 +	  git-cherry-pick git-status
  
  # The ones that do not have to link with lcrypto, lz nor xdiff.
  SIMPLE_PROGRAMS = \
@@@ -167,8 -167,8 +167,8 @@@ PROGRAMS = 
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
  	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
 -BUILT_INS = git-log$X \
 -	git-count-objects$X
 +BUILT_INS = git-log$X git-whatchanged$X git-show$X \
- 	git-diff$X
++	git-count-objects$X git-diff$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -205,7 -205,7 +205,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 \
@@@ -215,8 -215,7 +215,8 @@@
  	$(DIFF_OBJS)
  
  BUILTIN_OBJS = \
 -	builtin-log.o builtin-help.o builtin-count.o
 +	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
 +	builtin-push.o builtin-grep.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -507,6 -506,9 +507,6 @@@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : 
  git-cherry-pick: git-revert
  	cp $< $@
  
 -git-show: git-whatchanged
 -	cp $< $@
 -
  git-status: git-commit
  	cp $< $@
  
@@@ -608,10 -610,7 +608,10 @@@ test-date$X: test-date.c date.o ctype.
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
  
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
 -	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
 +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