git: Use open_from_env before discover

This matches git behaviour
eza-community · Oct 30, 2022 · 1c77814 · 1c77814
1 parent 4e23f8e
commit 1c77814
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/fs/feature/git.rs b/src/fs/feature/git.rs
@@ -162,18 +162,23 @@ impl GitRepo {
     /// Returns the original buffer if none is found.
     fn discover(path: PathBuf) -> Result<Self, PathBuf> {
         info!("Searching for Git repository above {:?}", path);
-        let repo = match git2::Repository::discover(&path) {
+        // Search with GIT_DIR env variable first if set
+        let repo = match git2::Repository::open_from_env() {
             Ok(r) => r,
             Err(e) => {
-                error!("Error discovering Git repositories: {:?}", e);
-                match git2::Repository::open_from_env() {
-                    Ok(r) => r,
-                    Err(e) => {
-                        // anything other than NotFound implies GIT_DIR was set and we got actual error
-                        if e.code() != git2::ErrorCode::NotFound {
-                            error!("Error opening Git repo from env using GIT_DIR: {:?}", e);
+                // anything other than NotFound implies GIT_DIR was set and we got actual error
+                if e.code() != git2::ErrorCode::NotFound {
+                    error!("Error opening Git repo from env using GIT_DIR: {:?}", e);
+                    return Err(path);
+                } else {
+                    // nothing found, search using discover
+                    match git2::Repository::discover(&path) {
+                        Ok(r) => r,
+                        Err(e) => {
+                            error!("Error discovering Git repositories: {:?}", e);
+                            return Err(path);
+
                         }
-                        return Err(path);
                     }
                 }
             }