Skip to content

getAccessorFromCommit(): Remove superfluous infoAttrs variable #14456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2025
Merged

getAccessorFromCommit(): Remove superfluous infoAttrs variable #14456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/libfetchers/git.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,13 +735,10 @@ struct GitInputScheme : InputScheme

auto rev = *input.getRev();

Attrs infoAttrs({
{"rev", rev.gitRev()},
Copy link
Contributor

@xokdvium xokdvium Nov 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this was completely dead code?

Edit: specifically the "rev" Attr

Copy link
Member Author

@edolstra edolstra Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it was left over from when infoAttrs was used for caching.

{"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());

Expand Down Expand Up @@ -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)};
}
Expand Down
Loading