wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

fetchGit/fetchMercurial: Fix directory inclusion check

Browse source 
E.g. the existence of .gitignore would cause .git to be included.
This commit is contained in:
Eelco Dolstra 2017-11-21 19:12:47 +01:00
parent 6cdaa858d0
commit d7da6c9ea9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/primops/fetchMercurial.cc
View file

@ -52,8 +52,9 @@ HgInfo exportMercurial(ref<Store> store, const std::string & uri,
auto st = lstat(p);
if (S_ISDIR(st.st_mode)) {
auto i = files.lower_bound(file);
return i != files.end() && hasPrefix(*i, file);
auto prefix = file + "/";
auto i = files.lower_bound(prefix);
return i != files.end() && hasPrefix(*i, prefix);
}
return files.count(file);