summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-02 21:16:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-03 17:21:33 (GMT)
commit4ed115e9c545fb27a5b80c751b2c04ec7ecc4d97 (patch)
tree1013ab6caae09f903910897d457bca300f7d4f95 /builtin/commit.c
parent9c4d6c0297b7d6167bf330853139b0515b351b89 (diff)
downloadgit-4ed115e9c545fb27a5b80c751b2c04ec7ecc4d97.zip
git-4ed115e9c545fb27a5b80c751b2c04ec7ecc4d97.tar.gz
git-4ed115e9c545fb27a5b80c751b2c04ec7ecc4d97.tar.bz2
cache-tree: do not try to use an invalidated subtree info to build a tree
We punt from repairing the cache-tree during a branch switching if it involves having to create a new tree object that does not yet exist in the object store. "mkdir dir && >dir/file && git add dir" followed by "git checkout" is one example, when a tree that records the state of such "dir/" is not in the object store. However, after discovering that we do not have a tree object that records the state of "dir/", the caller failed to remember the fact that it noticed the cache-tree entry it received for "dir/" is invalidated, it already knows it should not be populating the level that has "dir/" as its immediate subdirectory, and it is not an error at all for the sublevel cache-tree entry gave it a bogus object name it shouldn't even look at. This led the caller to detect and report a non-existent error. The end result was the same and we avoided stuffing a non-existent tree to the cache-tree, but we shouldn't have issued an alarming error message to the user. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions