max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 07:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats 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_); auto oid = hashToOID(oid_);
/* If the root directory contains */
auto _tree = lookupObject(*this, oid, GIT_OBJECT_TREE); auto _tree = lookupObject(*this, oid, GIT_OBJECT_TREE);
auto tree = (const git_tree *) &*_tree; auto tree = (const git_tree *) &*_tree;
if (git_tree_entrycount(tree) == 1) { if (git_tree_entrycount(tree) == 1) {
auto entry = git_tree_entry_byindex(tree, 0); auto entry = git_tree_entry_byindex(tree, 0);
auto mode = git_tree_entry_filemode(entry); 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); 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 * If the specified Git object is a directory with a single entry
* that is a directory or a non-executable regular file, return * that is a directory, return the ID of that object.
* 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.
*/ */
virtual Hash dereferenceSingletonDirectory(const Hash & oid) = 0; virtual Hash dereferenceSingletonDirectory(const Hash & oid) = 0;
}; };

10
tests/functional/tarball.sh
View file

@ -92,15 +92,7 @@ path="$(nix flake prefetch --json "tarball+file://$TEST_ROOT/tar.tar" | jq -r .s
[[ -d "$path/foo" ]] [[ -d "$path/foo" ]]
[[ -d "$path/bar" ]] [[ -d "$path/bar" ]]
# Test a tarball that has a single non-executable regular file. # Test a tarball that has a single regular file.
rm -rf "$TEST_ROOT/tar_root"
mkdir -p "$TEST_ROOT/tar_root"
echo bar > "$TEST_ROOT/tar_root/foo"
tar cvf "$TEST_ROOT/tar.tar" -C "$TEST_ROOT/tar_root" .
path="$(nix flake prefetch --refresh --json "tarball+file://$TEST_ROOT/tar.tar" | jq -r .storePath)"
[[ $(cat "$path") = bar ]]
# Test a tarball that has a single executable regular file.
rm -rf "$TEST_ROOT/tar_root" rm -rf "$TEST_ROOT/tar_root"
mkdir -p "$TEST_ROOT/tar_root" mkdir -p "$TEST_ROOT/tar_root"
echo bar > "$TEST_ROOT/tar_root/foo" echo bar > "$TEST_ROOT/tar_root/foo"