Merge branch 'js/read-tree'

diff --cc Makefile
index 5f4bb8d8f8963b31a1a8e48c2f6fb6ed01db3673,b2332761babbf75f42dac2994cb371cfd01a9685..a538710ed6b53079f85582c83be11ae414380d15
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -227,7 -221,7 +227,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 dir.h path-list.h builtin.h
 -      tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h
++      tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h
  
  DIFF_OBJS = \
        diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -242,50 -236,20 +242,50 @@@ LIB_OBJS = 
        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 \
-       alloc.o merge-file.o path-list.o help.o $(DIFF_OBJS)
 -      alloc.o merge-file.o path-list.o unpack-trees.o $(DIFF_OBJS)
++      alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
 -      builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 -      builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
 -      builtin-rm.o builtin-init-db.o builtin-rev-parse.o \
 -      builtin-tar-tree.o builtin-upload-tar.o builtin-update-index.o \
 -      builtin-ls-files.o builtin-ls-tree.o builtin-write-tree.o \
 -      builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.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-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
 -      builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
 -      builtin-mv.o
 +      builtin-add.o \
 +      builtin-apply.o \
 +      builtin-cat-file.o \
 +      builtin-checkout-index.o \
 +      builtin-check-ref-format.o \
 +      builtin-commit-tree.o \
 +      builtin-count-objects.o \
 +      builtin-diff.o \
 +      builtin-diff-files.o \
 +      builtin-diff-index.o \
 +      builtin-diff-stages.o \
 +      builtin-diff-tree.o \
 +      builtin-fmt-merge-msg.o \
 +      builtin-grep.o \
 +      builtin-init-db.o \
 +      builtin-log.o \
 +      builtin-ls-files.o \
 +      builtin-ls-tree.o \
 +      builtin-mailinfo.o \
 +      builtin-mailsplit.o \
 +      builtin-mv.o \
 +      builtin-name-rev.o \
 +      builtin-pack-objects.o \
 +      builtin-prune.o \
 +      builtin-prune-packed.o \
 +      builtin-push.o \
 +      builtin-read-tree.o \
 +      builtin-repo-config.o \
 +      builtin-rev-list.o \
 +      builtin-rev-parse.o \
 +      builtin-rm.o \
 +      builtin-show-branch.o \
 +      builtin-stripspace.o \
 +      builtin-symbolic-ref.o \
 +      builtin-tar-tree.o \
 +      builtin-unpack-objects.o \
 +      builtin-update-index.o \
 +      builtin-update-ref.o \
 +      builtin-upload-tar.o \
 +      builtin-verify-pack.o \
 +      builtin-write-tree.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz

diff --cc builtin-read-tree.c
index 71a7026df4bec244acdf36ef9559eecc5b65fae3,8869cedea1f9b07d78520858876cca614283d01b..8da8acbb0a25f88073254e21936a6ad5c6d0cca4
--- 1/builtin-read-tree.c
--- 2/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@@ -874,17 -92,17 +92,15 @@@ int cmd_read_tree(int argc, const char 
  {
        int i, newfd, stage = 0;
        unsigned char sha1[20];
-       merge_fn_t fn = NULL;
+       struct unpack_trees_options opts;
  
-       df_conflict_list.next = &df_conflict_list;
-       state.base_dir = "";
-       state.force = 1;
-       state.quiet = 1;
-       state.refresh_cache = 1;
+       memset(&opts, 0, sizeof(opts));
+       opts.head_idx = -1;
  
+       setup_git_directory();
        git_config(git_default_config);
  
 -      newfd = hold_lock_file_for_update(&lock_file, get_index_file());
 -      if (newfd < 0)
 -              die("unable to create new index file");
 +      newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
  
        git_config(git_default_config);