From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:04:55 +0000 (+0900)
Subject: Merge branch 'bw/grep-recurse-submodules' into maint
X-Git-Tag: v2.15.1~34
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fd7c38c7937a25da55943187a29462c3fa7fb487?hp=21deee3cabce7d58c50992f57a224e52187a1d26

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

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

diff --git a/builtin/grep.c b/builtin/grep.c
index 2d65f27d01..5a6cfe6b45 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -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;