Commits

Anonymous committed 7c4f050 Merge with conflicts

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

  • Participants
  • Parent commits fc26f57, 8cb5775

Comments (0)

Files changed (1)

 		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));