From: Junio C Hamano <junkio@cox.net>
Date: Sat, 20 May 2006 01:15:34 +0000 (-0700)
Subject: Merge branch 'jc/tartree' into next
X-Git-Tag: v1.4.1-rc1~80
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5b1bb3653d9d117bc0d504e1c344471064da43b8;p=git.git

Merge branch 'jc/tartree' into next

* jc/tartree:
  built-in tar-tree and remote tar-tree
---

5b1bb3653d9d117bc0d504e1c344471064da43b8
diff --cc Makefile
index abfc07358,f4bcec496..1d265a4d4
--- a/Makefile
+++ b/Makefile
@@@ -170,9 -170,8 +170,9 @@@ 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-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
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -220,8 -219,8 +220,8 @@@ 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-tar-tree.o builtin-upload-tar.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
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
diff --cc git.c
index eab8c1f45,fd8e9bf7f..a5690e3ea
--- a/git.c
+++ b/git.c
@@@ -51,10 -50,10 +51,12 @@@ 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 },
+ 		{ "tar-tree", cmd_tar_tree },
+ 		{ "upload-tar", cmd_upload_tar },
 -		{ "rev-list", cmd_rev_list },
  		{ "check-ref-format", cmd_check_ref_format }
  	};
  	int i;