diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:27 +0900 |
| commit | 2502f018f4cc514b75bdd50c20695d8a35e1d0b5 (patch) | |
| tree | 48cac8f52214865128da37a745d6c74578784091 | |
| parent | Merge branch 'mh/test-local-canary' (diff) | |
| parent | grep: take the read-lock when adding a submodule (diff) | |
| download | tgif-2502f018f4cc514b75bdd50c20695d8a35e1d0b5.tar.xz | |
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
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |