Skip to content

Conversation

@stefanhaller
Copy link
Collaborator

@stefanhaller stefanhaller commented Sep 7, 2025

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 b3a3410.

Fixes #4879.

…ngs 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 b3a3410.
@stefanhaller stefanhaller added the bug Something isn't working label Sep 7, 2025
@codacy-production
Copy link

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for 0d5a4101 100.00%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (0d5a410) Report Missing Report Missing Report Missing
Head commit (26096d9) 57739 50192 86.93%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#4880) 2 2 100.00%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.

@stefanhaller stefanhaller merged commit b4a38a3 into master Sep 15, 2025
14 checks passed
@stefanhaller stefanhaller deleted the show-enter-in-keybindings-menu branch September 15, 2025 15:02
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Sep 18, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | patch | `v0.55.0` -> `v0.55.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary>

### [`v0.55.1`](https://github.com/jesseduffield/lazygit/releases/tag/v0.55.1)

[Compare Source](jesseduffield/lazygit@v0.55.0...v0.55.1)

<!-- Release notes generated using configuration in .github/release.yml at v0.55.1 -->

This hotfix release fixes two bugs that have crept in in v0.55.0: one is a regression that broke displaying the enter key in the keybindings menu, the other is a problem with a newly added feature that didn't work quite correctly. See below for details.

For the changes in 0.55.0, see <https://github.com/jesseduffield/lazygit/releases/tag/v0.55.0>.

#### What's Changed

##### Fixes 🔧

- Don't hide keybindings that match the confirmMenu key in the keybindings menu by [@&#8203;stefanhaller](https://github.com/stefanhaller) in [#&#8203;4880](jesseduffield/lazygit#4880)
- Fix staging when using the new useExternalDiffGitConfig config by [@&#8203;stefanhaller](https://github.com/stefanhaller) in [#&#8203;4895](jesseduffield/lazygit#4895)

**Full Changelog**: <jesseduffield/lazygit@v0.55.0...v0.55.1>

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMTUuNiIsInVwZGF0ZWRJblZlciI6IjQxLjExNS42IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
karolzwolak pushed a commit to karolzwolak/lazygit that referenced this pull request Sep 27, 2025
…ngs menu (jesseduffield#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 b3a3410.

Fixes jesseduffield#4879.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

"<enter>" is not displayed in the keybindings panel

2 participants