diff options
author | Pascal Kuthe | 2022-12-11 10:20:34 +0000 |
---|---|---|
committer | GitHub | 2022-12-11 10:20:34 +0000 |
commit | 70d78123b94d93c801171ac3dd29e2a493feee20 (patch) | |
tree | f57fc633bca23b9d34f59b2d8e9ff0fbf4e70d57 /helix-loader/src | |
parent | 0e8ea13696206aa8ad289d539a5df62f34a73dec (diff) |
properly handle detachted git worktrees (#5097)
Diffstat (limited to 'helix-loader/src')
-rw-r--r-- | helix-loader/src/grammar.rs | 2 | ||||
-rw-r--r-- | helix-loader/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
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; |