mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-26 22:12:10 +02:00
Code

Merge branch 'bw/grep-recurse-submodules' into maint

Browse Source 
A broken access to object databases in recent update to "git grep
--recurse-submodules" has been fixed.

* bw/grep-recurse-submodules:
  grep: take the read-lock when adding a submodule
This commit is contained in:
Junio C Hamano 2017-11-15 12:04:55 +09:00
commit fd7c38c793
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/grep.c
View File

@ -431,7 +431,9 @@ static int grep_submodule(struct grep_opt *opt, struct repository *superproject,
* store is no longer global and instead is a member of the repository
* object.
*/
grep_read_lock();
add_to_alternates_memory(submodule.objectdir);
grep_read_unlock();
if (oid) {
struct object *object;