summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-11 10:33:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-11 10:33:32 -0700
commit3fd13cbcd58f078476cabab926931a3d5bdedfe2 (patch)
treed8126c3dea8b3c7189165db37a6b7978480943e8 /resolve-undo.h
parentMerge branch 'rs/ref-transaction-1' (diff)
parentcache-tree: do not try to use an invalidated subtree info to build a tree (diff)
downloadtgif-3fd13cbcd58f078476cabab926931a3d5bdedfe2.tar.xz
Merge branch 'dt/cache-tree-repair'
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: do not try to use an invalidated subtree info to build a tree 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
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions