Skip to content

Commit

Permalink
Revert "editor: save and reset terminal after calling EDITOR"
Browse files Browse the repository at this point in the history
This reverts commit 3d411af,
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/[email protected]/

Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
gitster committed Nov 22, 2021
1 parent 3d411af commit e3f7e01
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions editor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -86,19 +83,14 @@ 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);
}

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);
Expand Down

0 comments on commit e3f7e01

Please sign in to comment.