repository: support unabsorbed in repo_submodule_init
In preparation for a subsequent commit that migrates code using add_submodule_odb() to repo_submodule_init(), teach repo_submodule_init() to support submodules with unabsorbed gitdirs. (See the documentation for "git submodule absorbgitdirs" for more information about absorbed and unabsorbed gitdirs.) Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
5df5106e1e
commit
8eb8dcf946
@ -11,15 +11,13 @@ static void die_usage(const char **argv, const char *msg)
|
||||
int cmd__submodule_nested_repo_config(int argc, const char **argv)
|
||||
{
|
||||
struct repository subrepo;
|
||||
const struct submodule *sub;
|
||||
|
||||
if (argc < 3)
|
||||
die_usage(argv, "Wrong number of arguments.");
|
||||
|
||||
setup_git_directory();
|
||||
|
||||
sub = submodule_from_path(the_repository, null_oid(), argv[1]);
|
||||
if (repo_submodule_init(&subrepo, the_repository, sub)) {
|
||||
if (repo_submodule_init(&subrepo, the_repository, argv[1], null_oid())) {
|
||||
die_usage(argv, "Submodule not found.");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user