Merge branch 'jc/tartree' into next

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

diff --cc Makefile
index abfc07358256219c60d5aabdcbe6879d4c064e3d,f4bcec496a616d111bad42b70b8289a9cde74d7c..1d265a4d4f96eb8f0de8d14d8306b9818fd018fd
--- 1/Makefile
--- 2/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 builtin.h
Simple merge

diff --cc git.c
index eab8c1f45208a9d0ffb881f1d0f19f6b13c3dbfb,fd8e9bf7f2b2f7c26984248d0afe2d2143c82cf8..a5690e3ea89aa714701b70c918dc47844a73178f
--- 1/git.c
--- 2/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 },
 -              { "rev-list", cmd_rev_list },
+               { "tar-tree", cmd_tar_tree },
+               { "upload-tar", cmd_upload_tar },
                { "check-ref-format", cmd_check_ref_format }
        };
        int i;