Merge branch 'jt/add-submodule-odb-clean-up'
More code paths that use the hack to add submodule's object database to the set of alternate object store have been cleaned up. * jt/add-submodule-odb-clean-up: revision: remove "submodule" from opt struct repository: support unabsorbed in repo_submodule_init submodule: remove unnecessary unabsorbed fallback
This commit is contained in:
@ -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