aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-28 22:57:47 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-28 22:57:47 -0700
commit3f69d405d749742945afd462bff6541604ecd420 (patch)
tree8abc47e17be2680b2e93f3c8c0e503d66bdee3bc /.gitignore
parent7d65848afd42f075f6db0d03da2c9f5a9bac6267 (diff)
parent7d55561986ffe94ca7ca22dc0a6846f698893226 (diff)
downloadgit-3f69d405d749742945afd462bff6541604ecd420.tar.gz
git-3f69d405d749742945afd462bff6541604ecd420.tar.xz
Merge branch 'jc/cache-tree'
* jc/cache-tree: (26 commits) builtin-rm: squelch compiler warnings. git-write-tree writes garbage on sparc64 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". ... Conflicts: Makefile, builtin.h, git.c: resolved the same way as in next.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ec4c0dc3d..afd087621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ git-write-tree
git-core-*/?*
test-date
test-delta
+test-dump-cache-tree
common-cmds.h
*.tar.gz
*.dsc