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

* jc/builtin-n-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.

diff --cc Makefile
index 677bc13,14873fa..355e0cc
--- 1/Makefile
--- 2/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-tar-tree$X git-upload-tar$X git-format-patch$X
++      git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$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-tar-tree.o builtin-upload-tar.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-apply.c
Simple merge

diff --cc builtin-ls-files.c
index dfe1481,3a0c5f2..8dae9f7
--- 1/ls-files.c
--- 2/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 builtin-read-tree.c
index 55f7f87,ec40d01..629d151
--- 1/read-tree.c
--- 2/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@@ -9,9 -9,9 +9,10 @@@
  
  #include "object.h"
  #include "tree.h"
 +#include "cache-tree.h"
  #include <sys/time.h>
  #include <signal.h>
+ #include "builtin.h"
  
  static int reset = 0;
  static int merge = 0;

diff --cc builtin-show-branch.c
Simple merge

diff --cc builtin.h
Simple merge

diff --cc git.c
Simple merge