summaryrefslogtreecommitdiff
path: root/checkout-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-20 07:56:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-20 07:56:11 (GMT)
commit283c8eef6c9a4e379c73904d2bc22b19341b15c8 (patch)
tree80eb9553f23256e1f1cbb6ba022b330a8a6a4422 /checkout-index.c
parent288c0384505e6c25cc1a162242919a0485d50a74 (diff)
parentb6c4a480b3161effaa3578df91d8cdc83044d7b6 (diff)
downloadgit-283c8eef6c9a4e379c73904d2bc22b19341b15c8.zip
git-283c8eef6c9a4e379c73904d2bc22b19341b15c8.tar.gz
git-283c8eef6c9a4e379c73904d2bc22b19341b15c8.tar.bz2
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. ...
Diffstat (limited to 'checkout-index.c')
-rw-r--r--checkout-index.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/checkout-index.c b/checkout-index.c
index cc3a745..9876af6 100644
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -39,6 +39,7 @@
#include "cache.h"
#include "strbuf.h"
#include "quote.h"
+#include "cache-tree.h"
#define CHECKOUT_ALL 4
static const char *prefix;