mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
Use a PTY when calling external diff command (#3120)
This commit is contained in:
commit
d8059d7f7d
@ -45,8 +45,9 @@ func (gui *Gui) onResize() error {
|
|||||||
func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error {
|
func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error {
|
||||||
width, _ := gui.Views.Main.Size()
|
width, _ := gui.Views.Main.Size()
|
||||||
pager := gui.git.Config.GetPager(width)
|
pager := gui.git.Config.GetPager(width)
|
||||||
|
externalDiffCommand := gui.Config.GetUserConfig().Git.Paging.ExternalDiffCommand
|
||||||
|
|
||||||
if pager == "" {
|
if pager == "" && externalDiffCommand == "" {
|
||||||
// if we're not using a custom pager we don't need to use a pty
|
// if we're not using a custom pager we don't need to use a pty
|
||||||
return gui.newCmdTask(view, cmd, prefix)
|
return gui.newCmdTask(view, cmd, prefix)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user