Merge branch 'jc/cache-tree' into next

diff --git a/.gitignore b/.gitignore
index 145f8555ad4b5c13cb7a6076cf7d9e809beff952..cdb2d53318148dbfde43cbcf218abcbb5cf5a434 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -123,6 +123,7 @@ git-write-tree
 git-core-*/?*
 test-date
 test-delta
+test-dump-cache-tree
 test-gsimm
 common-cmds.h
 *.tar.gz