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

Merge branch 'jc/diff' into next

* jc/diff:
builtin-diff: call it "git-diff", really.
---

200f5dffc257f99f99597d1a8127e1d79ff3c176
diff --combined Makefile
index 2aa3586d02,47b165e301..b2b8b5d8a9
--- a/Makefile
+++ b/Makefile
@@@ -115,7 -115,7 +115,7 @@@ 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-count-objects.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 \
@@@ -167,7 -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
+ BUILT_INS = git-log$X \
+ 	git-diff$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -204,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 \
@@@ -214,8 -215,7 +215,8 @@@
  	$(DIFF_OBJS)
  
  BUILTIN_OBJS = \
 -	builtin-log.o builtin-help.o builtin-diff.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
@@@ -610,10 -610,7 +611,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
diff --combined git.c
index 6d51add7d5,e6a960a965..d5f0faa907
--- a/git.c
+++ b/git.c
@@@ -46,11 -46,7 +46,11 @@@ 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 },
- 		{ "diffn", cmd_diff },
+ 		{ "diff", cmd_diff },
 +		{ "push", cmd_push },
 +		{ "grep", cmd_grep },
  	};
  	int i;