lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libfetchers: represent unfetched submodules consistently

Browse source 
Unfetched submodules are included as empty directories in archives, so they end
up as such in the store when fetched in clean mode. Make sure the same happens
in dirty mode too. Fortunately, they are already correctly represented in the
ls-files output, so we just need to make sure to include the empty directory in
our filter.

Fixes: https://github.com/NixOS/nix/issues/6247
Change-Id: I60d06ff360cfa305d081b920838c893c06da801c
This commit is contained in:
alois31 2024-06-12 19:42:38 +02:00 committed by alois31
parent ce2b48aa41
commit aa00a5a8c9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libfetchers/git.cc
View file

@ -232,7 +232,7 @@ std::pair<StorePath, Input> fetchFromWorkdir(ref<Store> store, Input & input, co
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
auto prefix = file + "/"; auto prefix = file + "/";
auto i = files.lower_bound(prefix); auto i = files.lower_bound(prefix);
return i != files.end() && (*i).starts_with(prefix); return (i != files.end() && (*i).starts_with(prefix)) || files.count(file);
} }
return files.count(file); return files.count(file);

2
tests/functional/fetchGitSubmodules.sh
View file

@ -40,6 +40,7 @@ initGitRepo $rootRepo
git -C $rootRepo submodule init git -C $rootRepo submodule init
git -C $rootRepo submodule add $subRepo sub git -C $rootRepo submodule add $subRepo sub
git -C $rootRepo add sub git -C $rootRepo add sub
r0=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = file://$rootRepo; }).outPath")
git -C $rootRepo commit -m "Add submodule" git -C $rootRepo commit -m "Add submodule"
rev=$(git -C $rootRepo rev-parse HEAD) rev=$(git -C $rootRepo rev-parse HEAD)
@ -48,6 +49,7 @@ r1=$(nix eval --raw --expr "(builtins.fetchGit { url = file://$rootRepo; rev = \
r2=$(nix eval --raw --expr "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = false; }).outPath") r2=$(nix eval --raw --expr "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = false; }).outPath")
r3=$(nix eval --raw --expr "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = true; }).outPath") r3=$(nix eval --raw --expr "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = true; }).outPath")
[[ $r0 == $r1 ]] # verify that unfetched submodules result in empty directories in dirty mode too
[[ $r1 == $r2 ]] [[ $r1 == $r2 ]]
[[ $r2 != $r3 ]] [[ $r2 != $r3 ]]