undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/save-restore-terminal-revert' into maint

Browse Source 
Regression fix for 2.34

* jc/save-restore-terminal-revert:
  Revert "editor: save and reset terminal after calling EDITOR"
This commit is contained in:
Junio C Hamano 2021-11-23 14:48:15 -08:00
commit d62a7656fe
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor.c
View File

@ -3,7 +3,6 @@
#include "strbuf.h" #include "strbuf.h"
#include "run-command.h" #include "run-command.h"
#include "sigchain.h" #include "sigchain.h"
#include "compat/terminal.h"
#ifndef DEFAULT_EDITOR #ifndef DEFAULT_EDITOR
#define DEFAULT_EDITOR "vi" #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, static int launch_specified_editor(const char *editor, const char *path,
struct strbuf *buffer, const char *const *env) struct strbuf *buffer, const char *const *env)
{ {
int term_fail;
if (!editor) if (!editor)
return error("Terminal is dumb, but EDITOR unset"); 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.env = env;
p.use_shell = 1; p.use_shell = 1;
p.trace2_child_class = "editor"; p.trace2_child_class = "editor";
term_fail = save_term(1);
if (start_command(&p) < 0) { if (start_command(&p) < 0) {
if (!term_fail)
restore_term();
strbuf_release(&realpath); strbuf_release(&realpath);
return error("unable to start editor '%s'", editor); 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(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN); sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p); ret = finish_command(&p);
if (!term_fail)
restore_term();
strbuf_release(&realpath); strbuf_release(&realpath);
sig = ret - 128; sig = ret - 128;
sigchain_pop(SIGINT); sigchain_pop(SIGINT);