wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 18:31:49 +02:00
Code Activity

Don't dereference top-level regular files

Browse source 
Since this yielded an empty directory as far back as Nix 2.3, we don't
really need special handling for executables vs non-executables.
This commit is contained in:
Eelco Dolstra 2024-07-29 14:34:02 +02:00
parent e0012b97ab
commit 7c18b4d060
3 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libfetchers/git-utils.cc
View file

@ -491,14 +491,13 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>
{
auto oid = hashToOID(oid_);
/* If the root directory contains */
auto _tree = lookupObject(*this, oid, GIT_OBJECT_TREE);
auto tree = (const git_tree *) &*_tree;
if (git_tree_entrycount(tree) == 1) {
auto entry = git_tree_entry_byindex(tree, 0);
auto mode = git_tree_entry_filemode(entry);
if (mode == GIT_FILEMODE_BLOB || mode == GIT_FILEMODE_TREE)
if (mode == GIT_FILEMODE_TREE)
oid = *git_tree_entry_id(entry);
}

7
src/libfetchers/git-utils.hh
View file

@ -101,12 +101,7 @@ struct GitRepo
/**
* If the specified Git object is a directory with a single entry
* that is a directory or a non-executable regular file, return
* the ID of that object.
*
* Note: We don't do this for executable files because they don't
* have a tree hash in the Git object model that distinguishes
* them from non-executable files.
* that is a directory, return the ID of that object.
*/
virtual Hash dereferenceSingletonDirectory(const Hash & oid) = 0;
};