mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
Merge branch 'rj/launch-editor-error-message'
Git writes a "waiting for your editor" message on an incomplete line after launching an editor, and then append another error message on the same line if the editor errors out. It now clears the "waiting for..." line before giving the error message. * rj/launch-editor-error-message: launch_editor: waiting message on error
This commit is contained in:
commit
5615be39bc
7
editor.c
7
editor.c
|
@ -104,16 +104,15 @@ static int launch_specified_editor(const char *editor, const char *path,
|
|||
sigchain_pop(SIGQUIT);
|
||||
if (sig == SIGINT || sig == SIGQUIT)
|
||||
raise(sig);
|
||||
if (ret)
|
||||
return error("There was a problem with the editor '%s'.",
|
||||
editor);
|
||||
|
||||
if (print_waiting_for_editor && !is_terminal_dumb())
|
||||
/*
|
||||
* Erase the entire line to avoid wasting the
|
||||
* vertical space.
|
||||
*/
|
||||
term_clear_line();
|
||||
if (ret)
|
||||
return error("there was a problem with the editor '%s'",
|
||||
editor);
|
||||
}
|
||||
|
||||
if (!buffer)
|
||||
|
|
Loading…
Reference in a new issue