1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00

Merge pull request #14456 from NixOS/remove-infoAttrs

getAccessorFromCommit(): Remove superfluous infoAttrs variable
This commit is contained in:
Eelco Dolstra 2025-11-03 13:33:58 +00:00 committed by GitHub
commit 5e025ce940
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -735,13 +735,10 @@ struct GitInputScheme : InputScheme
auto rev = *input.getRev();
Attrs infoAttrs({
{"rev", rev.gitRev()},
{"lastModified", getLastModified(*input.settings, repoInfo, repoDir, rev)},
});
input.attrs.insert_or_assign("lastModified", getLastModified(*input.settings, repoInfo, repoDir, rev));
if (!getShallowAttr(input))
infoAttrs.insert_or_assign("revCount", getRevCount(*input.settings, repoInfo, repoDir, rev));
input.attrs.insert_or_assign("revCount", getRevCount(*input.settings, repoInfo, repoDir, rev));
printTalkative("using revision %s of repo '%s'", rev.gitRev(), repoInfo.locationToArg());
@ -797,9 +794,6 @@ struct GitInputScheme : InputScheme
}
assert(!origRev || origRev == rev);
if (!getShallowAttr(input))
input.attrs.insert_or_assign("revCount", getIntAttr(infoAttrs, "revCount"));
input.attrs.insert_or_assign("lastModified", getIntAttr(infoAttrs, "lastModified"));
return {accessor, std::move(input)};
}