1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00

Improve git submodule error reporting

This commit is contained in:
Eelco Dolstra 2023-11-14 15:52:18 +01:00
parent c257c82447
commit 6ec6b8aa36
3 changed files with 14 additions and 2 deletions

View file

@ -605,7 +605,7 @@ struct GitInputScheme : InputScheme
attrs.insert_or_assign("rev", submoduleRev.gitRev());
auto submoduleInput = fetchers::Input::fromAttrs(std::move(attrs));
auto [submoduleAccessor, submoduleInput2] =
submoduleInput.scheme->getAccessor(store, submoduleInput);
submoduleInput.getAccessor(store);
mounts.insert_or_assign(submodule.path, submoduleAccessor);
}
@ -649,7 +649,7 @@ struct GitInputScheme : InputScheme
attrs.insert_or_assign("url", submodulePath.abs());
auto submoduleInput = fetchers::Input::fromAttrs(std::move(attrs));
auto [submoduleAccessor, submoduleInput2] =
submoduleInput.scheme->getAccessor(store, submoduleInput);
submoduleInput.getAccessor(store);
/* If the submodule is dirty, mark this repo dirty as
well. */