submodule: remove unnecessary unabsorbed fallback

In get_submodule_repo_for(), there is a fallback code path for the case
in which a submodule has an unabsorbed gitdir. (See the documentation
for "git submodule absorbgitdirs" for more information about absorbed
and unabsorbed gitdirs.) However, this code path is unnecessary, because
such submodules are already handled: when the fetch_task is created in
fetch_task_create(), it will create its own struct submodule with a path
and name, and repo_submodule_init() can handle such a struct.

This fallback was introduced in 26f80ccfc1 ("submodule: migrate
get_next_submodule to use repository structs", 2018-12-05). It was
unnecessary even then, but perhaps it escaped notice because its parent
commit d5498e0871 ("repository: repo_submodule_init to take a submodule
struct", 2018-12-05) was the one that taught repo_submodule_init() to
handle such created structs. Before, it took a path and always checked
.gitmodules, so it truly would have failed if there were no entry in
.gitmodules.

(Note to reviewers: in 26f80ccfc1, the "own struct submodule" I
mentioned is in get_next_submodule(), not fetch_task_create().)

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule.c b/submodule.c
index 8de1aecaeb03113504c59bdfe886afe98e60435e..3af3da5b5ed2c0fd4f55566ddb379b84d54337cf 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1409,19 +1409,8 @@ static struct repository *get_submodule_repo_for(struct repository *r,
        struct repository *ret = xmalloc(sizeof(*ret));
 
        if (repo_submodule_init(ret, r, sub)) {
-               /*
-                * No entry in .gitmodules? Technically not a submodule,
-                * but historically we supported repositories that happen to be
-                * in-place where a gitlink is. Keep supporting them.
-                */
-               struct strbuf gitdir = STRBUF_INIT;
-               strbuf_repo_worktree_path(&gitdir, r, "%s/.git", sub->path);
-               if (repo_init(ret, gitdir.buf, NULL)) {
-                       strbuf_release(&gitdir);
-                       free(ret);
-                       return NULL;
-               }
-               strbuf_release(&gitdir);
+               free(ret);
+               return NULL;
        }
 
        return ret;