Fix staging when using the new useExternalDiffGitConfig config (#4895 )

This new config was introduced in 0.55, but it made it impossible to enter the staging view or custom patch building view. Fixes https://github.com/jesseduffield/lazygit/pull/4832#issuecomment-3289371491.
Fix staging when using the new useExternalDiffGitConfig config
2026-10-04 13:06:51 -04:00 · 2025-09-17 20:39:08 +02:00 · 2025-09-17 20:37:14 +02:00 · 2025-09-15 17:02:50 +02:00 · 2025-09-07 12:43:54 +02:00
4 changed files with 5 additions and 3 deletions
@@ -267,7 +267,7 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain
 	noIndex := !node.GetIsTracked() && !node.GetHasStagedChanges() && !cached && node.GetIsFile()
 	extDiffCmd := self.UserConfig().Git.Paging.ExternalDiffCommand
 	useExtDiff := extDiffCmd != "" && !plain
-	useExtDiffGitConfig := self.UserConfig().Git.Paging.UseExternalDiffGitConfig
+	useExtDiffGitConfig := self.UserConfig().Git.Paging.UseExternalDiffGitConfig && !plain

 	cmdArgs := NewGitCmd("diff").
 		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
@@ -305,7 +305,7 @@ func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reve

 	extDiffCmd := self.UserConfig().Git.Paging.ExternalDiffCommand
 	useExtDiff := extDiffCmd != "" && !plain
-	useExtDiffGitConfig := self.UserConfig().Git.Paging.UseExternalDiffGitConfig
+	useExtDiffGitConfig := self.UserConfig().Git.Paging.UseExternalDiffGitConfig && !plain

 	cmdArgs := NewGitCmd("diff").
 		Config("diff.noprefix=false").
@@ -51,6 +51,7 @@ func (self *OptionsMenuAction) Call() error {
 		HideCancel:                true,
 		ColumnAlignment:           []utils.Alignment{utils.AlignRight, utils.AlignLeft},
 		AllowFilteringKeybindings: true,
+		KeepConfirmKeybindings:    true,
 	})
 }

@@ -35,7 +35,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
 		maxColumnSize = max(maxColumnSize, len(item.LabelColumns))

 		// Remove all item keybindings that are the same as the confirm binding
-		if item.Key == confirmKey {
+		if item.Key == confirmKey && !opts.KeepConfirmKeybindings {
 			item.Key = nil
 		}
 	}
@@ -156,6 +156,7 @@ type CreateMenuOptions struct {
 	HideCancel                bool
 	ColumnAlignment           []utils.Alignment
 	AllowFilteringKeybindings bool
+	KeepConfirmKeybindings    bool // if true, the keybindings that match the confirm binding will not be removed from menu items
 }

 type CreatePopupPanelOpts struct {
Author	SHA1	Message	Date
Stefan Haller	3de12b7fde	Fix staging when using the new useExternalDiffGitConfig config (#4895 ) This new config was introduced in 0.55, but it made it impossible to enter the staging view or custom patch building view. Fixes https://github.com/jesseduffield/lazygit/pull/4832#issuecomment-3289371491.	2025-09-17 20:39:08 +02:00
Stefan Haller	c35e3776dd	Fix staging when using the new useExternalDiffGitConfig config This new config was introduced in 0.55, but it didn't work in the staging view or custom patch building view.	2025-09-17 20:37:14 +02:00
Stefan Haller	b4a38a368a	Don't hide keybindings that match the confirmMenu key in the keybindings menu (#4880 ) In all other menus besides the keybindings menu it makes sense to hide keybindings that match the confirmMenu binding. This is important to make it clear which action will be triggered when you press the key. In the keybindings menu this is different; the main purpose of that menu is not to allow triggering commands by their key while the menu is open, but to serve as a reference for what the keybindings are when it is not open. Because of this, it is more important to show all bindings in this menu, even if they conflict with the confirmMenu key. This fixes a regression introduced in `b3a3410a1a`. Fixes #4879.	2025-09-15 17:02:50 +02:00
Stefan Haller	26096d9dd9	Don't hide keybindings that match the confirmMenu key in the keybindings menu In all other menus besides the keybindings menu it makes sense to hide keybindings that match the confirmMenu binding. This is important to make it clear which action will be triggered when you press the key. In the keybindings menu this is different; the main purpose of that menu is not to allow triggering commands by their key while the menu is open, but to serve as a reference for what the keybindings are when it is not open. Because of this, it is more important to show all bindings in this menu, even if they conflict with the confirmMenu key. This fixes a regression introduced in `b3a3410a1a`.	2025-09-07 12:43:54 +02:00