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

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

Conflicts:
builtin/grep.c

diff --git a/builtin/grep.c b/builtin/grep.c
index 1c359c2671536287d97f2049b27a390d33b51e88..a286692e467710d92346ab6900e98f1126cb967d 100644 (file)
--- 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));