From: Junio C Hamano <gitster@pobox.com>
To: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Cc: git@vger.kernel.org, phillip.wood123@gmail.com,
thomas.wolf@paranor.ch, Alexander Veit <alexander.veit@gmx.net>
Subject: Re: [PATCH] editor: only save (and restore) the terminal if using a tty
Date: Mon, 22 Nov 2021 15:08:45 -0800 [thread overview]
Message-ID: <xmqq5ysjbxfm.fsf@gitster.g> (raw)
In-Reply-To: <xmqqa6hvbxob.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 22 Nov 2021 15:03:32 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> In any case, I am quite tempted to just revert the offending topic
> for now, but later accept a resurrection patch with this isatty
> check rolled in (either at this caller, or inside save_term) when
> the dust settles.
So, here is that first step, to be hopefully mergeable to 'master'
and also to 'maint' for 2.34.1
----- >8 --------- >8 --------- >8 --------- >8 --------- >8 -----
Subject: [PATCH] Revert "editor: save and reset terminal after calling EDITOR"
This reverts commit 3d411afabc9a96f41d47c07d6af6edda3d29ec92,
blindly opening /dev/tty and calling tcsetattr() seems to be causing
problems.
cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=577358
cf. https://lore.kernel.org/git/04ab7301-ea34-476c-eae4-4044fef74b91@gmail.com/
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
editor.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/editor.c b/editor.c
index be7441e7e0..6303ae0ab0 100644
--- a/editor.c
+++ b/editor.c
@@ -3,7 +3,6 @@
#include "strbuf.h"
#include "run-command.h"
#include "sigchain.h"
-#include "compat/terminal.h"
#ifndef DEFAULT_EDITOR
#define DEFAULT_EDITOR "vi"
@@ -51,8 +50,6 @@ 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");
@@ -86,10 +83,7 @@ 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);
}
@@ -97,8 +91,6 @@ 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.34.0-222-gceadac38b1
next prev parent reply other threads:[~2021-11-22 23:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 8:42 Update to Git 2.34.0 breaks application Alexander Veit
2021-11-22 21:43 ` Phillip Wood
2021-11-22 22:28 ` [PATCH] editor: only save (and restore) the terminal if using a tty Carlo Marcelo Arenas Belón
2021-11-22 22:47 ` Junio C Hamano
2021-11-22 23:03 ` Junio C Hamano
2021-11-22 23:08 ` Junio C Hamano [this message]
2021-11-23 8:52 ` Alexander Veit
2021-11-23 9:08 ` Carlo Arenas
2021-11-22 23:39 ` Carlo Arenas
2021-11-23 17:35 ` Junio C Hamano
2021-11-24 13:29 ` Johannes Schindelin
2021-11-24 18:25 ` Carlo Arenas
2021-11-24 19:34 ` Junio C Hamano
2021-11-24 20:04 ` Carlo Arenas
2021-11-24 20:51 ` Junio C Hamano
2021-11-29 21:12 ` Johannes Schindelin
2021-11-23 11:05 ` Phillip Wood
2021-11-23 17:27 ` Junio C Hamano
2021-11-23 17:31 ` Carlo Arenas
2021-11-30 11:07 ` Phillip Wood
2021-12-01 5:12 ` Chris Torek
2021-12-01 19:33 ` Junio C Hamano
2021-12-02 0:38 ` Junio C Hamano
2021-12-02 1:51 ` Carlo Arenas
2021-12-02 14:48 ` Johannes Schindelin
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=xmqq5ysjbxfm.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexander.veit@gmx.net \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=thomas.wolf@paranor.ch \
/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).