Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ pub fn find_parent_repository(path: impl AsRef<Path>) -> Option<PathBuf> {
let mut path = path.as_ref();

loop {
if path.join(DOT_GIT_DIRECTORY_NAME).is_dir() {
if path.join(DOT_GIT_DIRECTORY_NAME).exists() {
return Some(path.to_path_buf());
}

Expand Down Expand Up @@ -282,7 +282,7 @@ mod tests {
}

#[test]
fn test_find_parent_directory_success() {
fn test_find_parent_repository_success() {
let temp_dir = TempDirectoryBuilder::default()
.add_directory("repository/suddir/subsub")
.add_directory("repository/.git")
Expand All @@ -305,6 +305,22 @@ mod tests {
assert_eq!(find_parent_repository(&not_a_repo_sub), None);
}

#[test]
fn test_find_parent_repository_worktree() {
let temp_dir = TempDirectoryBuilder::default()
.add_directory("worktree/subdir")
.add_empty_file("worktree/.git")
.build()
.unwrap();
let worktree_path = temp_dir.path().join("worktree");
let subdir_path = worktree_path.join("subdir");

assert_eq!(
find_parent_repository(&subdir_path).as_ref(),
Some(&worktree_path)
);
}

#[test]
fn test_find_ignored_files_not_a_git_repository() {
let temp_dir = TempDirectoryBuilder::default().build().unwrap();
Expand Down