Merge branch 'dt/cache-tree-repair' into jch
commitece7f2d938ee5afb2024ba5d1614e53de1e2efdb
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:03 +0000 (21 11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:03 +0000 (21 11:12 -0700)
tree7d8e97b0bd1d3c7dfa476efa90a083dbd9a06137
parent74785f1ff32b47f84a7ab8e99a9d7d802c54f491
parent9c4d6c0297b7d6167bf330853139b0515b351b89
Merge branch 'dt/cache-tree-repair' into jch

Add a few more places in "commit" and "checkout" that make sure
that the cache-tree is fully populated in the index.

* dt/cache-tree-repair:
  cache-tree: Write updated cache-tree after commit
  cache-tree: subdirectory tests
  test-dump-cache-tree: invalid trees are not errors
  cache-tree: create/update cache-tree on checkout

# Conflicts:
#  builtin/checkout.c
#  builtin/commit.c
builtin/checkout.c
builtin/commit.c
cache-tree.c
cache-tree.h
test-dump-cache-tree.c