development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-14 19:52:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4135: if theres include = [...], then dont prepopulate filelist via git

Browse source
This commit is contained in:
Felix S. Klock II 2017-06-16 17:54:44 +02:00
parent 1c5885240c
commit 6eaa964d3e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cargo/sources/path.rs
View file

@ -114,8 +114,11 @@ impl<'cfg> PathSource<'cfg> {
}
};
if let Some(result) = self.discover_git_and_list_files(pkg, root, &mut filter) {
return result;
// attempt git-prepopulate only if no `include` (rust-lang/cargo#4135)
if include.is_empty() {
if let Some(result) = self.discover_git_and_list_files(pkg, root, &mut filter) {
return result;
}
}
self.list_files_walk(pkg, &mut filter)