From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Nov 2017 04:11:27 +0000 (+0900)
Subject: Merge branch 'bw/grep-recurse-submodules'
X-Git-Tag: v2.16.0-rc0~174
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2502f018f4cc514b75bdd50c20695d8a35e1d0b5?hp=51bb4d62a06b0313dd3e4610da8af1bbf9497894

Merge branch 'bw/grep-recurse-submodules'

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;