Skip to content

Commit 0eeedae

Browse files
committed
fix(vendor)!: dont exclude .cargo_vcs_info.json
To make the behavior change outstanding for fixing rust-lang/#11000 this is split into a separate commit.
1 parent feb364d commit 0eeedae

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/cargo/ops/vendor.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,6 @@ fn vendor_this(relative: &Path) -> bool {
647647
// Temporary Cargo files
648648
Some(".cargo-ok") => false,
649649

650-
// Explicitly exclude .cargo_vcs_info.json to keep the old behavior.
651-
Some(".cargo_vcs_info.json") => false,
652-
653650
// Skip patch-style orig/rej files. Published crates on crates.io
654651
// have `Cargo.toml.orig` which we don't want to use here and
655652
// otherwise these are rarely used as part of the build process.

tests/testsuite/vendor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ fn ignore_files() {
10961096
p.cargo("vendor --respect-source-config").run();
10971097
let csum = p.read_file("vendor/url/.cargo-checksum.json");
10981098
assert!(!csum.contains("foo.orig"));
1099-
assert!(!csum.contains(".cargo_vcs_info.json"));
1099+
assert!(csum.contains(".cargo_vcs_info.json"));
11001100
assert!(!csum.contains(".gitignore"));
11011101
assert!(!csum.contains(".gitattributes"));
11021102
assert!(!csum.contains(".cargo-ok"));

0 commit comments

Comments
 (0)