Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
commit-tree: allow generic object name for the tree as well.
Makefile: remove and create xdiff library from scratch.
t0000-basic: Add ls-tree recursive test back.

diff --combined Makefile
index 7ca38554acdbecd2571fabe61b94f34fd009aa20,d2cc01a265d1ed5ccb7ac28a7afd025d4b76321e..9bf6c809750cd681bfea122aa694f2a968253821
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -580,7 -580,7 +580,7 @@@ $(LIB_FILE): $(LIB_OBJS
  XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o
  
  $(XDIFF_LIB): $(XDIFF_OBJS)
-       $(AR) rcs $@ $(XDIFF_OBJS)
+       rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
  
  
  doc:
@@@ -614,9 -614,6 +614,9 @@@ test-delta$X: test-delta.c diff-delta.
  test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
 +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o
 +      $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
  check:
        for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -665,7 -662,6 +665,7 @@@ clean
        rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
                $(LIB_FILE) $(XDIFF_LIB)
        rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +      rm -f test-date$X test-delta$X test-gsimm$X
        rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
        rm -rf $(GIT_TARNAME)
        rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz

diff --combined update-index.c
index 157488ff1a87df262e6177671f5e568b8d155de3,258a88cbeac7edc103b94446198383628c2e19cb..4c6bcfaedd6cd6bb53c0d783ef49fcd24b191850
--- 1/update-index.c
--- 2/update-index.c
+++ b/update-index.c
@@@ -6,8 -6,8 +6,9 @@@
  #include "cache.h"
  #include "strbuf.h"
  #include "quote.h"
+ #include "cache-tree.h"
  #include "tree-walk.h"
 +#include "cache-tree.h"
  
  /*
   * Default to not allowing changes to the list of files. The
@@@ -562,7 -562,6 +563,7 @@@ static int unresolve_one(const char *pa
                goto free_return;
        }
  
 +      cache_tree_invalidate_path(active_cache_tree, path);
        remove_file_from_cache(path);
        if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
                error("%s: cannot add our version to the index.", path);