From 31c01d3d2c10c8049d011760493d50a36c98b44c Mon Sep 17 00:00:00 2001
From: Jem Tucker <jem.tucker@gmail.com>
Date: Sat, 10 Aug 2024 19:35:39 +0100
Subject: [PATCH 1/2] test: Add test for issue #14379

---
 tests/testsuite/build_script.rs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
index 04af014dae80..4cd3584bf13d 100644
--- a/tests/testsuite/build_script.rs
+++ b/tests/testsuite/build_script.rs
@@ -14,7 +14,7 @@ use cargo_test_support::tools;
 use cargo_test_support::{
     basic_manifest, cargo_exe, cross_compile, is_coarse_mtime, project, project_in,
 };
-use cargo_test_support::{rustc_host, sleep_ms, slow_cpu_multiplier, symlink_supported};
+use cargo_test_support::{git, rustc_host, sleep_ms, slow_cpu_multiplier, symlink_supported};
 use cargo_util::paths::{self, remove_dir_all};
 
 #[cargo_test]
@@ -5814,3 +5814,25 @@ fn links_overrides_with_target_applies_to_host() {
 "#]])
         .run();
 }
+
+#[cargo_test]
+fn directory_with_leading_underscore() {
+    let p: cargo_test_support::Project = git::new("foo", |p| {
+        p.no_manifest()
+            .file(
+                "_foo/foo/Cargo.toml",
+                r#"
+                [package]
+                name = "foo"
+                version = "0.1.0"
+                edition = "2021"
+                build = "build.rs"
+            "#,
+            )
+            .file("_foo/foo/src/main.rs", "fn main() {}")
+            .file("_foo/foo/build.rs", "fn main() { }")
+    });
+    p.cargo("build --manifest-path=_foo/foo/Cargo.toml -v")
+        .with_status(0)
+        .run();
+}

From 87ac7a175b290fe23ecd4cc73a12c5f775645c0a Mon Sep 17 00:00:00 2001
From: Jem Tucker <jem.tucker@gmail.com>
Date: Sat, 10 Aug 2024 19:37:51 +0100
Subject: [PATCH 2/2] fix: use longhand gitoxide path-spec patterns

---
 src/cargo/sources/path.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 4159da352754..d4acb1d2095a 100644
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -610,11 +610,11 @@ fn list_files_gix(
 
     let pathspec = {
         // Include the package root.
-        let mut include = BString::from(":/");
+        let mut include = BString::from(":(top)");
         include.push_str(package_prefix.as_ref());
 
         // Exclude the target directory.
-        let mut exclude = BString::from(":!/");
+        let mut exclude = BString::from(":!(exclude,top)");
         exclude.push_str(target_prefix.as_ref());
 
         vec![include, exclude]