From dd0c34c46bdda0c20fd92d00516e711a4c9f7837 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 24 Apr 2006 15:12:42 -0700 Subject: [PATCH] cache-tree: protect against "git prune". We reused the cache-tree data without verifying the tree object still exists. Recompute in cache_tree_update() an otherwise valid cache-tree entry when the tree object disappeared. This is not usually a problem, but theoretically without this fix things can break when the user does something like this: - read-index from a side branch - write-tree the result - remove the side branch with "git branch -D" - remove the unreachable objects with "git prune" - write-tree what is in the index. Signed-off-by: Junio C Hamano --- cache-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache-tree.c b/cache-tree.c index f6d1dd1d7..b34b0bc31 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -177,7 +177,7 @@ static int update_one(struct cache_tree *it, char *buffer; int i; - if (0 <= it->entry_count) + if (0 <= it->entry_count && has_sha1_file(it->sha1)) return it->entry_count; /* -- 2.30.2