diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-11-23 14:48:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-23 14:48:15 -0800 |
| commit | d62a7656fed27af65b1eb5c49501343696ad728a (patch) | |
| tree | e743e24ccc081d449c755ec9720be0238316a047 | |
| parent | Merge branch 'ds/add-rm-with-sparse-index' into maint (diff) | |
| parent | Revert "editor: save and reset terminal after calling EDITOR" (diff) | |
| download | tgif-d62a7656fed27af65b1eb5c49501343696ad728a.tar.xz | |
Merge branch 'jc/save-restore-terminal-revert' into maint
Regression fix for 2.34
* jc/save-restore-terminal-revert:
Revert "editor: save and reset terminal after calling EDITOR"
| -rw-r--r-- | editor.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -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); |