kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <junkio@cox.net>
maint
Junio C Hamano 2006-04-24 15:12:42 -07:00
parent 17448209f5
commit dd0c34c46b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache-tree.c
View File

@ -177,7 +177,7 @@ static int update_one(struct cache_tree *it,
char *buffer; char *buffer;
int i; int i;


if (0 <= it->entry_count) if (0 <= it->entry_count && has_sha1_file(it->sha1))
return it->entry_count; return it->entry_count;


/* /*