Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree
authorJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 07:56:11 +0000 (00:56 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 07:56:11 +0000 (00:56 -0700)
commit283c8eef6c9a4e379c73904d2bc22b19341b15c8
tree80eb9553f23256e1f1cbb6ba022b330a8a6a4422
parent288c0384505e6c25cc1a162242919a0485d50a74
parentb6c4a480b3161effaa3578df91d8cdc83044d7b6
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree

* jc/cache-tree: (24 commits)
  Fix crash when reading the empty tree
  fsck-objects: do not segfault on missing tree in cache-tree
  cache-tree: a bit more debugging support.
  read-tree: invalidate cache-tree entry when a new index entry is added.
  Fix test-dump-cache-tree in one-tree disappeared case.
  fsck-objects: mark objects reachable from cache-tree
  cache-tree: replace a sscanf() by two strtol() calls
  cache-tree.c: typefix
  test-dump-cache-tree: validate the cached data as well.
  cache_tree_update: give an option to update cache-tree only.
  read-tree: teach 1-way merege and plain read to prime cache-tree.
  read-tree: teach 1 and 2 way merges about cache-tree.
  update-index: when --unresolve, smudge the relevant cache-tree entries.
  test-dump-cache-tree: report number of subtrees.
  cache-tree: sort the subtree entries.
  Teach fsck-objects about cache-tree.
  index: make the index file format extensible.
  cache-tree: protect against "git prune".
  Add test-dump-cache-tree
  Use cache-tree in update-index.
  ...
Makefile
apply.c
cache.h
checkout-index.c
read-cache.c
read-tree.c
update-index.c