The first batch after 2.22

diff --git a/editor.c b/editor.c
index 9a9b4e12d1db7f8ec2f4f99d9a5f348b680cecc3..71547674ab4e885bd06560a547e78fddb0849158 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "strbuf.h"
 #include "run-command.h"
 #include "sigchain.h"
@@ -34,10 +35,21 @@ const char *git_editor(void)
        return editor;
 }
 
-int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
+const char *git_sequence_editor(void)
 {
-       const char *editor = git_editor();
+       const char *editor = getenv("GIT_SEQUENCE_EDITOR");
+
+       if (!editor)
+               git_config_get_string_const("sequence.editor", &editor);
+       if (!editor)
+               editor = git_editor();
 
+       return editor;
+}
+
+static int launch_specified_editor(const char *editor, const char *path,
+                                  struct strbuf *buffer, const char *const *env)
+{
        if (!editor)
                return error("Terminal is dumb, but EDITOR unset");
 
@@ -66,6 +78,7 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
                p.argv = args;
                p.env = env;
                p.use_shell = 1;
+               p.trace2_child_class = "editor";
                if (start_command(&p) < 0)
                        return error("unable to start editor '%s'", editor);
 
@@ -95,3 +108,14 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
                return error_errno("could not read file '%s'", path);
        return 0;
 }
+
+int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
+{
+       return launch_specified_editor(git_editor(), path, buffer, env);
+}
+
+int launch_sequence_editor(const char *path, struct strbuf *buffer,
+                          const char *const *env)
+{
+       return launch_specified_editor(git_sequence_editor(), path, buffer, env);
+}