From: Junio C Hamano <junkio@cox.net>
Date: Tue, 25 Apr 2006 04:28:07 +0000 (-0700)
Subject: Merge branch 'jc/cache-tree' into next
X-Git-Tag: v1.4.1-rc1~185
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dc844aaad83ede855fccc9af9b555796c9c758ad;p=git.git

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  index: make the index file format extensible.
  cache-tree: protect against "git prune".
  Add test-dump-cache-tree
---

dc844aaad83ede855fccc9af9b555796c9c758ad
diff --cc .gitignore
index 145f8555a,7906909b3..cdb2d5331
--- a/.gitignore
+++ b/.gitignore
@@@ -123,7 -123,7 +123,8 @@@ git-write-tre
  git-core-*/?*
  test-date
  test-delta
+ test-dump-cache-tree
 +test-gsimm
  common-cmds.h
  *.tar.gz
  *.dsc
diff --cc Makefile
index 589dbe1d8,1aa96f4f2..41a0d93a6
--- a/Makefile
+++ b/Makefile
@@@ -611,9 -611,9 +611,12 @@@ 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) $^ -lz
  
+ 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
  
diff --cc update-index.c
index ea1a37705,d6d3295e3..157488ff1
--- a/update-index.c
+++ b/update-index.c
@@@ -6,13 -6,8 +6,9 @@@
  #include "cache.h"
  #include "strbuf.h"
  #include "quote.h"
 +#include "tree-walk.h"
- #include "tree.h"
  #include "cache-tree.h"
  
- static unsigned char active_cache_sha1[20];
- static struct cache_tree *active_cache_tree;
- 
  /*
   * Default to not allowing changes to the list of files. The
   * tool doesn't actually care, but this makes it harder to add
@@@ -764,14 -624,10 +759,12 @@@ int main(int argc, const char **argv
  				free(path_name);
  		}
  	}
 +
 + finish:
  	if (active_cache_changed) {
- 		if (write_cache_1(newfd, active_cache, active_nr,
- 				  active_cache_sha1) ||
+ 		if (write_cache(newfd, active_cache, active_nr) ||
  		    commit_index_file(&cache_file))
  			die("Unable to write new cachefile");
- 		write_cache_tree(active_cache_sha1, active_cache_tree);
  	}
  
  	return has_errors ? 1 : 0;