From 70d78123b94d93c801171ac3dd29e2a493feee20 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe
Date: Sun, 11 Dec 2022 11:20:34 +0100
Subject: properly handle detachted git worktrees (#5097)

---
 helix-loader/src/grammar.rs | 2 +-
 helix-loader/src/lib.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'helix-loader')

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;
-- 
cgit v1.2.3-70-g09d2