Explicitly pass pathspec to include more files

With this change, when `get_status` is run in a sub-directory, it also
returns matches in sub-directories that don’t share a prefix with the
sub-directory it is being run in.

Author: cruessler

asyncgit/src/error.rs

@@ -123,6 +123,10 @@ pub enum Error {
 		#[from] gix::object::find::existing::with_conversion::Error,
 	),
 
+	///
+	#[error("gix::pathspec::init::Error error: {0}")]
+	GixPathspecInit(#[from] Box<gix::pathspec::init::Error>),
+
 	///
 	#[error("gix::reference::head_tree_id::Error error: {0}")]
 	GixReferenceHeadTreeId(
@@ -191,6 +195,12 @@ impl From<gix::discover::Error> for Error {
 	}
 }
 
+impl From<gix::pathspec::init::Error> for Error {
+	fn from(error: gix::pathspec::init::Error) -> Self {
+		Self::GixPathspecInit(Box::new(error))
+	}
+}
+
 impl From<gix::status::Error> for Error {
 	fn from(error: gix::status::Error) -> Self {
 		Self::GixStatus(Box::new(error))

asyncgit/src/sync/status.rs

@@ -213,6 +213,14 @@ pub fn get_status(
 					repo.index_or_empty()?,
 				);
 
+			let mut pathspec = repo.pathspec(
+				false, /* empty patterns match prefix */
+				None::<&str>,
+				true, /* inherit ignore case */
+				&gix::index::State::new(repo.object_hash()),
+				gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
+			)?;
+
 			let cb =
 				|change_ref: gix::diff::index::ChangeRef<'_, '_>,
 				 _: &gix::index::State,
@@ -229,7 +237,7 @@ pub fn get_status(
 			repo.tree_index_status(
 				&tree_id,
 				&worktree_index,
-				None,
+				Some(&mut pathspec),
 				gix::status::tree_index::TrackRenames::default(),
 				cb,
 			)?;

asyncgit/src/sync/utils.rs

@@ -230,6 +230,7 @@ mod tests {
 		},
 	};
 	use std::{
+		env,
 		fs::{self, remove_file, File},
 		io::Write,
 		path::Path,
@@ -270,6 +271,44 @@ mod tests {
 		assert_eq!(get_statuses(repo_path), (1, 1));
 	}
 
+	#[test]
+	fn test_staging_one_file_from_different_sub_directory() {
+		// This test case covers an interaction between current working directory and the way
+		// `gitoxide` handles pathspecs.
+		//
+		// When staging a new file in one sub-directory, then running running `get_status` in a
+		// different sub-directory, `repo.pathspec` in `get_status` has to initialized with
+		// `empty_patterns_match_prefix` set to `false` for `get_status` to report the staged file’s
+		// status.
+		let file_path = Path::new("untracked/file1.txt");
+		let (_td, repo) = repo_init().unwrap();
+		let root = repo.path().parent().unwrap();
+		let repo_path: &RepoPath =
+			&root.as_os_str().to_str().unwrap().into();
+
+		fs::create_dir(root.join("untracked")).unwrap();
+
+		File::create(root.join(file_path))
+			.unwrap()
+			.write_all(b"test file1 content")
+			.unwrap();
+
+		let sub_dir_path = root.join("unrelated");
+
+		fs::create_dir(root.join("unrelated")).unwrap();
+
+		let current_dir = env::current_dir().unwrap();
+		env::set_current_dir(sub_dir_path).unwrap();
+
+		assert_eq!(get_statuses(repo_path), (1, 0));
+
+		stage_add_file(repo_path, file_path).unwrap();
+
+		assert_eq!(get_statuses(repo_path), (0, 1));
+
+		env::set_current_dir(current_dir).unwrap();
+	}
+
 	#[test]
 	fn test_staging_folder() -> Result<()> {
 		let (_td, repo) = repo_init().unwrap();