From: Maximiliano Curia <maxy@debian.org>
Date: Sat, 2 Sep 2017 14:06:57 +0200
Subject: Debian patch, the best default editor is editor

Author: Yann Dirson <dirson@debian.org>
Forwarded: not-needed
Last-Update: 2014-03-26
---
 stgit/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: stgit/src/patch/edit/interactive.rs
===================================================================
--- stgit.orig/src/patch/edit/interactive.rs
+++ stgit/src/patch/edit/interactive.rs
@@ -151,7 +151,7 @@ fn get_editor(config: &gix::config::Snap
     } else if let Some(editor) = std::env::var_os("EDITOR") {
         editor
     } else {
-        OsString::from("vi")
+        OsString::from("editor")
     };
     Ok(editor)
 }
Index: stgit/t/t3300-edit.sh
===================================================================
--- stgit.orig/t/t3300-edit.sh
+++ stgit/t/t3300-edit.sh
@@ -131,7 +131,7 @@ test_expect_success 'Save template to st
 #   3. core.editor
 #   4. VISUAL
 #   5. EDITOR
-#   6. vi
+#   6. editor
 
 mkeditor ()
 {
@@ -141,12 +141,12 @@ mkeditor ()
 }
 
 test_expect_success !MINGW 'Edit commit message interactively (vi)' '
-    mkeditor vi &&
-    test_when_finished "rm -f vi" &&
+    mkeditor editor &&
+    test_when_finished "rm -f editor" &&
     unset EDITOR &&
     m=$(msg HEAD) &&
     PATH=.:$PATH stg edit p2 &&
-    test "$(msg HEAD)" = "$m//vi"
+    test "$(msg HEAD)" = "$m//editor"
 '
 
 test_expect_success 'Edit commit message interactively (EDITOR)' '
