mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nm/grep-object-sha1-lock'

Browse Source 
* nm/grep-object-sha1-lock:
  grep: Fix race condition in delta_base_cache

Conflicts:
	builtin/grep.c
This commit is contained in:
Junio C Hamano
2011-10-05 12:35:53 -07:00
parent 1b840a5662 8cb5775b2b
commit 00723b0291
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/grep.c
View File

@ -598,8 +598,11 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
struct strbuf base; struct strbuf base;
int hit, len; int hit, len;
read_sha1_lock();
data = read_object_with_reference(obj->sha1, tree_type, data = read_object_with_reference(obj->sha1, tree_type,
&size, NULL); &size, NULL);
read_sha1_unlock();
if (!data) if (!data)
die(_("unable to read tree (%s)"), sha1_to_hex(obj->sha1)); die(_("unable to read tree (%s)"), sha1_to_hex(obj->sha1));