From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jan 2019 20:47:54 +0000 (-0800)
Subject: Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'
X-Git-Tag: v2.21.0-rc0~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d3635db19c6dff4fb063fabfa4161fd3b8285f0;p=git

Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'

"git fetch --recurse-submodules" may not fetch the necessary commit
that is bound to the superproject, which is getting corrected.

* sb/submodule-recursive-fetch-gets-the-tip:
  fetch: ensure submodule objects fetched
  submodule.c: fetch in submodules git directory instead of in worktree
  submodule: migrate get_next_submodule to use repository structs
  repository: repo_submodule_init to take a submodule struct
  submodule: store OIDs in changed_submodule_names
  submodule.c: tighten scope of changed_submodule_names struct
  submodule.c: sort changed_submodule_names before searching it
  submodule.c: fix indentation
  sha1-array: provide oid_array_filter
---

5d3635db19c6dff4fb063fabfa4161fd3b8285f0
diff --cc builtin/grep.c
index 4748195ae1,d6bd887b2d..dc91838764
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@@ -437,7 -440,7 +440,7 @@@ static int grep_submodule(struct grep_o
  	 * store is no longer global and instead is a member of the repository
  	 * object.
  	 */
- 	add_to_alternates_memory(submodule.objects->odb->path);
 -	add_to_alternates_memory(subrepo.objects->objectdir);
++	add_to_alternates_memory(subrepo.objects->odb->path);
  	grep_read_unlock();
  
  	if (oid) {