chore: fix target dir ignore in generated gitignore

rust-lang · Mar 15, 2023 · fdd35e4 · fdd35e4
1 parent 4a3c588
commit fdd35e4
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
@@ -742,7 +742,7 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {
     // Using the push method with multiple arguments ensures that the entries
     // for all mutually-incompatible VCS in terms of syntax are in sync.
     let mut ignore = IgnoreList::new();
-    ignore.push("/target", "^target/", "target");
+    ignore.push("/target/", "^target/", "target");
     if !opts.bin {
         ignore.push("/Cargo.lock", "^Cargo.lock$", "Cargo.lock");
     }

diff --git a/tests/testsuite/init/auto_git/out/.gitignore b/tests/testsuite/init/auto_git/out/.gitignore
@@ -1,2 +1,2 @@
-/target
+/target/
 /Cargo.lock
diff --git a/tests/testsuite/init/explicit_bin_with_git/out/.gitignore b/tests/testsuite/init/explicit_bin_with_git/out/.gitignore
@@ -1 +1 @@
-/target
+/target/
diff --git a/tests/testsuite/init/git_autodetect/out/.gitignore b/tests/testsuite/init/git_autodetect/out/.gitignore
@@ -1,2 +1,2 @@
-/target
+/target/
 /Cargo.lock
diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/.gitignore b/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/.gitignore
@@ -2,5 +2,5 @@
 
 # Added by cargo
 
-/target
+/target/
 /Cargo.lock
diff --git a/tests/testsuite/init/inferred_bin_with_git/out/.gitignore b/tests/testsuite/init/inferred_bin_with_git/out/.gitignore
@@ -1 +1 @@
-/target
+/target/
diff --git a/tests/testsuite/init/inferred_lib_with_git/out/.gitignore b/tests/testsuite/init/inferred_lib_with_git/out/.gitignore
@@ -1,2 +1,2 @@
-/target
+/target/
 /Cargo.lock
diff --git a/tests/testsuite/init/pijul_autodetect/out/.ignore b/tests/testsuite/init/pijul_autodetect/out/.ignore
@@ -1,2 +1,2 @@
-/target
+/target/
 /Cargo.lock
diff --git a/tests/testsuite/init/simple_git/out/.gitignore b/tests/testsuite/init/simple_git/out/.gitignore
@@ -1,2 +1,2 @@
-/target
+/target/
 /Cargo.lock
diff --git a/tests/testsuite/init/simple_git_ignore_exists/in/.gitignore b/tests/testsuite/init/simple_git_ignore_exists/in/.gitignore
@@ -1,2 +1,2 @@
-/target
+/target/
 **/some.file
diff --git a/tests/testsuite/init/simple_git_ignore_exists/out/.gitignore b/tests/testsuite/init/simple_git_ignore_exists/out/.gitignore
@@ -1,9 +1,9 @@
-/target
+/target/
 **/some.file
 
 # Added by cargo
 #
 # already existing elements were commented out
 
-#/target
+#/target/
 /Cargo.lock
diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs
@@ -95,7 +95,7 @@ fn simple_git() {
 
     let fp = paths::root().join("foo/.gitignore");
     let contents = fs::read_to_string(&fp).unwrap();
-    assert_eq!(contents, "/target\n/Cargo.lock\n",);
+    assert_eq!(contents, "/target/\n/Cargo.lock\n",);
 
     cargo_process("build").cwd(&paths::root().join("foo")).run();
 }