Merge branch 'do/gitweb-strict-export-conf-doc'

diff --git a/builtin/grep.c b/builtin/grep.c
index 64b9167a593caac977ef353fe8082942c64c383d..4748195ae173786924f75dab9e865ce05b434930 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -437,7 +437,7 @@ 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.
         */
-       add_to_alternates_memory(submodule.objects->objectdir);
+       add_to_alternates_memory(submodule.objects->odb->path);
        grep_read_unlock();
 
        if (oid) {