git: use $EDITOR when not config.editor is absent

Pilou97 · Jan 23, 2024 · a238447 · a238447
1 parent 95b9495
commit a238447
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/git/config.rs b/src/git/config.rs
@@ -38,9 +38,12 @@ impl GitConfig {
             .get_string("user.name")
             .map_err(|_| println!("name not found in configuration"))?;
 
-        let editor = config
-            .get_string("core.editor")
-            .map_err(|_| println!("editor not found in configuration"))?;
+        let editor = (match config.get_string("core.editor") {
+            Ok(editor) => Ok(editor),
+            Err(_) => {
+                std::env::var("EDITOR").map_err(|_| println!("editor not found in configuration"))
+            }
+        })?;
 
         // Force rewriteRef = "refs/notes/commits" to exist
         let rewrite_ref = config