From 263ad11b3b7e611805b28e52dff6f19026368cf5 Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 22 Oct 2025 16:37:09 -0700 Subject: [PATCH] Use a PTY when using external diff command from git config Same logic as https://github.com/jesseduffield/lazygit/pull/3120 but for new external diff option --- pkg/gui/pty.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/gui/pty.go b/pkg/gui/pty.go index 688240dff32..66bb355f224 100644 --- a/pkg/gui/pty.go +++ b/pkg/gui/pty.go @@ -47,9 +47,10 @@ func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error width := view.InnerWidth() pager := gui.stateAccessor.GetPagerConfig().GetPagerCommand(width) externalDiffCommand := gui.stateAccessor.GetPagerConfig().GetExternalDiffCommand() + useExtDiffGitConfig := gui.stateAccessor.GetPagerConfig().GetUseExternalDiffGitConfig() - if pager == "" && externalDiffCommand == "" { - // if we're not using a custom pager we don't need to use a pty + if pager == "" && externalDiffCommand == "" && !useExtDiffGitConfig { + // If we're not using a custom pager nor external diff command, then we don't need to use a pty return gui.newCmdTask(view, cmd, prefix) }