Code

Fix mismerged update-index from jc/cache-tree branch.