chore: fix target dir ignore in generated gitignore

robjtede · robjtede · commit 2a54f88240a4 · 2023-03-15T04:48:57.000Z
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/simple_git/out/.gitignore b/tests/testsuite/init/simple_git/out/.gitignore
@@ -1,2 +1,2 @@
-/target
-/Cargo.lock
+/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,4 +1,4 @@
-/target
+/target/
 **/some.file
 
 # Added by cargo

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {`
`742`	`742`	`// Using the push method with multiple arguments ensures that the entries`
`743`	`743`	`// for all mutually-incompatible VCS in terms of syntax are in sync.`
`744`	`744`	`let mut ignore = IgnoreList::new();`
`745`		`- ignore.push("/target", "^target/", "target");`
	`745`	`+ ignore.push("/target/", "^target/", "target");`
`746`	`746`	`if !opts.bin {`
`747`	`747`	`ignore.push("/Cargo.lock", "^Cargo.lock$", "Cargo.lock");`
`748`	`748`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-/target`
	`1`	`+/target/`
`2`	`2`	`/Cargo.lock`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/target`
	`1`	`+/target/`
`2`	`2`	`**/some.file`
`3`	`3`
`4`	`4`	`# Added by cargo`