Merge branch 'eb/quilt' into next

* eb/quilt:
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport

diff --combined Makefile
index 4e4a9d0885f98884e4d942105d8e282844d7af6b,549f953b768e95b528b14657e4255c4b6a4147f3..53739867465186777e2fb3baa6c4b70975a2ce1d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -113,7 -113,7 +113,7 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  ### --- END CONFIGURATION SECTION ---
  
  SCRIPT_SH = \
 -      git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
 +      git-bisect.sh git-branch.sh git-checkout.sh \
        git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
        git-fetch.sh \
        git-format-patch.sh git-ls-remote.sh \
@@@ -125,7 -125,7 +125,7 @@@
        git-applymbox.sh git-applypatch.sh git-am.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
        git-merge-resolve.sh git-merge-ours.sh \
-       git-lost-found.sh
+       git-lost-found.sh git-quiltimport.sh
  
  SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
@@@ -170,7 -170,7 +170,7 @@@ 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-rev-list$X git-check-ref-format$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -199,7 -199,7 +199,7 @@@ LIB_H = 
        blob.h cache.h commit.h csum-file.h delta.h \
        diff.h object.h pack.h pkt-line.h quote.h refs.h \
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 -      tree-walk.h log-tree.h
 +      tree-walk.h log-tree.h dir.h
  
  DIFF_OBJS = \
        diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -207,10 -207,10 +207,10 @@@
        diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -      blob.o commit.o connect.o csum-file.o base85.o \
 +      blob.o commit.o connect.o csum-file.o cache-tree.o base85.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 \
 +      quote.o read-cache.o refs.o run-command.o dir.o \
        server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
        tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
        fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
@@@ -218,7 -218,7 +218,7 @@@
  
  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-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -610,9 -610,6 +610,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
        $(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
  
@@@ -655,25 -652,6 +655,25 @@@ dist: git.spec git-tar-tre
  rpm: dist
        $(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
  
 +htmldocs = git-htmldocs-$(GIT_VERSION)
 +manpages = git-manpages-$(GIT_VERSION)
 +dist-doc:
 +      rm -fr .doc-tmp-dir
 +      mkdir .doc-tmp-dir
 +      $(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
 +      cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
 +      gzip -n -9 -f $(htmldocs).tar
 +      :
 +      rm -fr .doc-tmp-dir
 +      mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
 +      $(MAKE) -C Documentation DESTDIR=. \
 +              man1=../.doc-tmp-dir/man1 \
 +              man7=../.doc-tmp-dir/man7 \
 +              install
 +      cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
 +      gzip -n -9 -f $(manpages).tar
 +      rm -fr .doc-tmp-dir
 +
  ### Cleaning rules
  
  clean:
@@@ -681,9 -659,8 +681,9 @@@
                $(LIB_FILE) $(XDIFF_LIB)
        rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
        rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
 -      rm -rf $(GIT_TARNAME)
 +      rm -rf $(GIT_TARNAME) .doc-tmp-dir
        rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
 +      rm -f $(htmldocs).tar $(manpages).tar
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates clean
        $(MAKE) -C t/ clean