NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 23:03:53 -04:00
Code Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2023-10-28 16:16:20 +02:00
parent d88106df24
commit 669b074f51
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libfetchers/git.cc
View file

@ -409,17 +409,6 @@ struct GitInputScheme : InputScheme
std::string name = input.getName(); std::string name = input.getName();
auto makeResult = [&](const Attrs & infoAttrs, ref<InputAccessor> accessor) -> std::pair<ref<InputAccessor>, Input>
{
assert(input.getRev());
assert(!origRev || origRev == input.getRev());
if (!repoInfo.shallow)
input.attrs.insert_or_assign("revCount", getIntAttr(infoAttrs, "revCount"));
input.attrs.insert_or_assign("lastModified", getIntAttr(infoAttrs, "lastModified"));
return {accessor, std::move(input)};
};
auto originalRef = input.getRef(); auto originalRef = input.getRef();
auto ref = originalRef ? *originalRef : getDefaultRef(repoInfo); auto ref = originalRef ? *originalRef : getDefaultRef(repoInfo);
input.attrs.insert_or_assign("ref", ref); input.attrs.insert_or_assign("ref", ref);
@ -558,7 +547,13 @@ struct GitInputScheme : InputScheme
} }
} }
return makeResult(infoAttrs, accessor); assert(input.getRev());
assert(!origRev || origRev == input.getRev());
if (!repoInfo.shallow)
input.attrs.insert_or_assign("revCount", getIntAttr(infoAttrs, "revCount"));
input.attrs.insert_or_assign("lastModified", getIntAttr(infoAttrs, "lastModified"));
return {accessor, std::move(input)};
} }
std::pair<ref<InputAccessor>, Input> getAccessorFromWorkdir( std::pair<ref<InputAccessor>, Input> getAccessorFromWorkdir(