if let Ok(status) = repo.status_file(relative) {
if status == git2::Status::CURRENT {
false
- } else if relative.to_str().unwrap_or("") == "Cargo.lock" {
+ } else if relative.file_name().and_then(|s| s.to_str()).unwrap_or("")
+ == "Cargo.lock"
+ {
// It is OK to include this file even if it is ignored.
status != git2::Status::IGNORED
} else {
// With an explicit `include` list, but Cargo.lock in .gitignore, don't
// complain about `Cargo.lock` being ignored. Note that it is still
// included in the packaged regardless.
- let (p, _r) = git::new_repo("foo", |p| {
+ let p = git::new("foo", |p| {
p.file(
"Cargo.toml",
- r#"
- [package]
- name = "foo"
- version = "0.0.1"
- authors = []
- license = "MIT"
- description = "foo"
- documentation = "foo"
- homepage = "foo"
- repository = "foo"
-
+ &pl_manifest(
+ "foo",
+ "0.0.1",
+ r#"
include = [
"src/main.rs"
]
- "#,
+ "#,
+ ),
)
.file("src/main.rs", "fn main() {}")
.file(".gitignore", "Cargo.lock")
)
.run();
}
+
+#[cargo_test]
+fn ignore_lockfile_inner() {
+ // Ignore `Cargo.lock` if in .gitignore in a git subdirectory.
+ let p = git::new("foo", |p| {
+ p.no_manifest()
+ .file("bar/Cargo.toml", &pl_manifest("bar", "0.0.1", ""))
+ .file("bar/src/main.rs", "fn main() {}")
+ .file("bar/.gitignore", "Cargo.lock")
+ });
+ p.cargo("generate-lockfile").cwd("bar").run();
+ p.cargo("package -v --no-verify")
+ .cwd("bar")
+ .with_stderr(
+ "\
+[PACKAGING] bar v0.0.1 ([..])
+[ARCHIVING] Cargo.toml
+[ARCHIVING] src/main.rs
+[ARCHIVING] .cargo_vcs_info.json
+[ARCHIVING] Cargo.lock
+",
+ )
+ .run();
+}