From: Junio C Hamano <junkio@cox.net>
Date: Wed, 24 May 2006 18:24:50 +0000 (-0700)
Subject: Merge branch 'jc/builtin-n-tar-tree'
X-Git-Tag: v1.4.0-rc1~77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2054be4c4816d8c363dc867f462bc0af9031c02;p=git.git

Merge branch 'jc/builtin-n-tar-tree'

This pulls in "make many commands built-in" branches.

* jc/builtin-n-tar-tree:
  built-in tar-tree and remote tar-tree
  Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
  Builtin git-show-branch.
  Builtin git-apply.
  Builtin git-commit-tree.
  Builtin git-read-tree.
  Builtin git-tar-tree.
  Builtin git-ls-tree.
  Builtin git-ls-files.
---

f2054be4c4816d8c363dc867f462bc0af9031c02
diff --cc Makefile
index 46c83cb4c,14873fa35..3bfe1c337
--- a/Makefile
+++ b/Makefile
@@@ -170,9 -168,12 +168,13 @@@ PROGRAMS = 
  
  BUILT_INS = git-log$X git-whatchanged$X git-show$X \
  	git-count-objects$X git-diff$X git-push$X \
 -	git-grep$X git-rev-list$X git-check-ref-format$X \
 -	git-init-db$X git-ls-files$X git-ls-tree$X \
 +	git-grep$X git-add$X git-rm$X git-rev-list$X \
 +	git-check-ref-format$X \
- 	git-init-db$X
++	git-init-db$X git-tar-tree$X git-upload-tar$X \
++	git-ls-files$X git-ls-tree$X \
+ 	git-read-tree$X git-commit-tree$X \
+ 	git-apply$X git-show-branch$X git-diff-files$X \
 -	git-diff-index$X git-diff-stages$X git-diff-tree$X \
 -	git-tar-tree$X git-upload-tar$X
++	git-diff-index$X git-diff-stages$X git-diff-tree$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -220,8 -221,12 +222,13 @@@ LIB_OBJS = 
  
  BUILTIN_OBJS = \
  	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 -	builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o \
 -	builtin-init-db.o builtin-ls-files.o builtin-ls-tree.o \
 +	builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
- 	builtin-rm.o builtin-init-db.o
++	builtin-rm.o builtin-init-db.o \
++	builtin-tar-tree.o builtin-upload-tar.o \
++	builtin-ls-files.o builtin-ls-tree.o \
+ 	builtin-read-tree.o builtin-commit-tree.o \
+ 	builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
 -	builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
 -	builtin-tar-tree.o builtin-upload-tar.o
++	builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
diff --cc builtin-ls-files.c
index dfe1481a3,3a0c5f215..8dae9f70e
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@@ -9,7 -10,7 +9,8 @@@
  
  #include "cache.h"
  #include "quote.h"
 +#include "dir.h"
+ #include "builtin.h"
  
  static int abbrev = 0;
  static int show_deleted = 0;
diff --cc git.c
index 4a2c4bab7,38e84618d..9ce458e69
--- a/git.c
+++ b/git.c
@@@ -50,11 -50,22 +50,24 @@@ static void handle_internal_command(in
  		{ "count-objects", cmd_count_objects },
  		{ "diff", cmd_diff },
  		{ "grep", cmd_grep },
 +		{ "rm", cmd_rm },
 +		{ "add", cmd_add },
  		{ "rev-list", cmd_rev_list },
  		{ "init-db", cmd_init_db },
- 		{ "check-ref-format", cmd_check_ref_format }
+ 		{ "tar-tree", cmd_tar_tree },
+ 		{ "upload-tar", cmd_upload_tar },
+ 		{ "check-ref-format", cmd_check_ref_format },
+ 		{ "ls-files", cmd_ls_files },
+ 		{ "ls-tree", cmd_ls_tree },
+ 		{ "tar-tree", cmd_tar_tree },
+ 		{ "read-tree", cmd_read_tree },
+ 		{ "commit-tree", cmd_commit_tree },
+ 		{ "apply", cmd_apply },
+ 		{ "show-branch", cmd_show_branch },
+ 		{ "diff-files", cmd_diff_files },
+ 		{ "diff-index", cmd_diff_index },
+ 		{ "diff-stages", cmd_diff_stages },
+ 		{ "diff-tree", cmd_diff_tree }
  	};
  	int i;