From: Junio C Hamano <junkio@cox.net>
Date: Wed, 26 Apr 2006 10:39:01 +0000 (-0700)
Subject: Merge branch 'jc/cache-tree' into next
X-Git-Tag: v1.4.1-rc1~179
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7608d4bf977d864a9409d366e25de9740b291d51?hp=-c

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.
---

7608d4bf977d864a9409d366e25de9740b291d51
diff --combined Makefile
index 7ca38554ac,d2cc01a265..9bf6c80975
--- a/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 157488ff1a,258a88cbea..4c6bcfaedd
--- a/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);