From 70d78123b94d93c801171ac3dd29e2a493feee20 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 11 Dec 2022 11:20:34 +0100
Subject: [PATCH] properly handle detachted git worktrees (#5097)

---
 helix-core/src/lib.rs       | 2 +-
 helix-loader/src/grammar.rs | 2 +-
 helix-loader/src/lib.rs     | 2 +-
 helix-term/src/ui/mod.rs    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 0e76ebbb..ee174e69 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -69,7 +69,7 @@ pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::Path
             top_marker = Some(ancestor);
         }
 
-        if ancestor.join(".git").is_dir() {
+        if ancestor.join(".git").exists() {
             // Top marker is repo root if not root marker was detected yet
             if top_marker.is_none() {
                 top_marker = Some(ancestor);
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 833616e0..2aa92475 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -263,7 +263,7 @@ fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
         ))?;
 
         // create the grammar dir contains a git directory
-        if !grammar_dir.join(".git").is_dir() {
+        if !grammar_dir.join(".git").exists() {
             git(&grammar_dir, ["init"])?;
         }
 
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 29a9f2e7..80d44a82 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -97,7 +97,7 @@ pub fn find_local_config_dirs() -> Vec<PathBuf> {
     let mut directories = Vec::new();
 
     for ancestor in current_dir.ancestors() {
-        if ancestor.join(".git").is_dir() {
+        if ancestor.join(".git").exists() {
             directories.push(ancestor.to_path_buf());
             // Don't go higher than repo if we're in one
             break;
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index f61c4c45..107e48dd 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -207,7 +207,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     // Cap the number of files if we aren't in a git project, preventing
     // hangs when using the picker in your home directory
-    let files: Vec<_> = if root.join(".git").is_dir() {
+    let files: Vec<_> = if root.join(".git").exists() {
         files.collect()
     } else {
         // const MAX: usize = 8192;