diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-11-21T18·12+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-11-21T18·34+0100 |
| commit | d7da6c9ea9459a2fa17c3e409120c5cdfde6afdc (patch) | |
| tree | 26676469ead12a6581c2301d395283129dd64f0d /src/libexpr | |
| parent | 6cdaa858d03b9c24f54f8157026cebaa02d9ac8a (diff) | |
fetchGit/fetchMercurial: Fix directory inclusion check
E.g. the existence of .gitignore would cause .git to be included.
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/primops/fetchGit.cc | 5 | ||||
| -rw-r--r-- | src/libexpr/primops/fetchMercurial.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc index bca68ed72091..fd3e84c292c3 100644 --- a/src/libexpr/primops/fetchGit.cc +++ b/src/libexpr/primops/fetchGit.cc @@ -56,8 +56,9 @@ GitInfo exportGit(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); diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index 7def7103bf3d..a317476c5829 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -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); |