diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-05-26 11:24:01 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-05-26 21:19:54 +1000 |
commit | bd2170a99cb996f2e00467a3416645a85eaf0549 (patch) | |
tree | 80b3c372c620dc9ff0d7083de92228c4d9dea061 /pkg/i18n/english.go | |
parent | c039e5bed06192ad536e07da7cf89a2502070a1d (diff) |
request explicit return from subprocess
Previously we were recording output from subprocesses using a multiwriter
and hooking that up to the cmd's stdout to write to both os.Stdout and
a buffer. We would then display the output after the program finished.
This worked well for commands like 'ls' but not for commands like 'vi'
which expect you to be in a tty, and when you've got the cmd's stdout
pointing at a multiwriter, the subprogram thinks we're not in a tty
and then things like terminal corruption can happen. This was the case
with neovim, and even in vim a warning was given with a pause before
starting the program.
Now we're chucking out the multiwriter and instead making it that you
need to press enter after the program has finished to return to lazygit.
This allows you to view the output of the program (e.g. if it's ls) and
then decide that you want to return. It's one level of unnecessary
redirection for editors like vim, but even they could potentially have
output to stderr/stdout that you want to look at before returning.
Please enter the commit message for your changes. Lines starting
Diffstat (limited to 'pkg/i18n/english.go')
-rw-r--r-- | pkg/i18n/english.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 291f114e8..36fb3e021 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -759,6 +759,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "resetTo", Other: `reset to`, + }, &i18n.Message{ + ID: "pressEnterToReturn", + Other: "Press enter to return to lazygit", }, ) } |