From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: johannes.schindelin@gmx.de,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH 2/2] editor: save and reset terminal after calling EDITOR
Date: Mon, 4 Oct 2021 00:26:00 -0700 [thread overview]
Message-ID: <20211004072600.74241-3-carenas@gmail.com> (raw)
In-Reply-To: <20211004072600.74241-1-carenas@gmail.com>
When EDITOR is invoked to modify a commit message, it will likely
change the terminal settings, and if it misbehaves will leave the
terminal output damaged as shown in a recent report from Windows
Terminal[1]
Instead use the functions provided by compat/terminal to save the
settings and recover safely.
[1] https://github.com/microsoft/terminal/issues/9359
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
editor.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/editor.c b/editor.c
index 6303ae0ab0..be7441e7e0 100644
--- a/editor.c
+++ b/editor.c
@@ -3,6 +3,7 @@
#include "strbuf.h"
#include "run-command.h"
#include "sigchain.h"
+#include "compat/terminal.h"
#ifndef DEFAULT_EDITOR
#define DEFAULT_EDITOR "vi"
@@ -50,6 +51,8 @@ const char *git_sequence_editor(void)
static int launch_specified_editor(const char *editor, const char *path,
struct strbuf *buffer, const char *const *env)
{
+ int term_fail;
+
if (!editor)
return error("Terminal is dumb, but EDITOR unset");
@@ -83,7 +86,10 @@ static int launch_specified_editor(const char *editor, const char *path,
p.env = env;
p.use_shell = 1;
p.trace2_child_class = "editor";
+ term_fail = save_term(1);
if (start_command(&p) < 0) {
+ if (!term_fail)
+ restore_term();
strbuf_release(&realpath);
return error("unable to start editor '%s'", editor);
}
@@ -91,6 +97,8 @@ static int launch_specified_editor(const char *editor, const char *path,
sigchain_push(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p);
+ if (!term_fail)
+ restore_term();
strbuf_release(&realpath);
sig = ret - 128;
sigchain_pop(SIGINT);
--
2.33.0.955.gee03ddbf0e
next prev parent reply other threads:[~2021-10-04 7:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 15:36 [RFC PATCH 0/2] protect git from a rogue editor Carlo Marcelo Arenas Belón
2021-10-02 15:36 ` [RFC PATCH 1/2] terminal: teach git how to save/restore its terminal settings Carlo Marcelo Arenas Belón
2021-10-02 15:36 ` [RFC PATCH 2/2] editor: save and reset terminal after calling EDITOR Carlo Marcelo Arenas Belón
2021-10-04 7:25 ` [PATCH 0/2] protect git from a rogue editor Carlo Marcelo Arenas Belón
2021-10-04 7:25 ` [PATCH 1/2] terminal: teach git how to save/restore its terminal settings Carlo Marcelo Arenas Belón
2021-10-04 16:36 ` Junio C Hamano
2021-10-04 17:27 ` Carlo Arenas
2021-10-04 18:10 ` Junio C Hamano
2021-10-04 18:33 ` Carlo Arenas
2021-10-04 7:26 ` Carlo Marcelo Arenas Belón [this message]
2021-10-04 16:38 ` [PATCH 0/2] protect git from a rogue editor Junio C Hamano
2021-10-05 7:46 ` [PATCH v2 " Carlo Marcelo Arenas Belón
2021-10-05 7:46 ` [PATCH v2 1/2] terminal: teach git how to save/restore its terminal settings Carlo Marcelo Arenas Belón
2021-10-05 7:46 ` [PATCH v2 2/2] editor: save and reset terminal after calling EDITOR Carlo Marcelo Arenas Belón
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211004072600.74241-3-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).