diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:37 -0700 |
| commit | 7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b (patch) | |
| tree | 744d04ea9231630c040e40c18a7a5899ed973700 /builtin | |
| parent | Merge branch 'jc/diff-index-unpack' into maint (diff) | |
| parent | grep: Fix race condition in delta_base_cache (diff) | |
| download | tgif-7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b.tar.xz | |
Merge branch 'nm/grep-object-sha1-lock' into maint
* nm/grep-object-sha1-lock:
grep: Fix race condition in delta_base_cache
Conflicts:
builtin/grep.c
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/grep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 1c359c2671..a286692e46 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -598,8 +598,11 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, struct strbuf base; int hit, len; + read_sha1_lock(); data = read_object_with_reference(obj->sha1, tree_type, &size, NULL); + read_sha1_unlock(); + if (!data) die(_("unable to read tree (%s)"), sha1_to_hex(obj->sha1)); |