fix: use Files-specific keybinding for reset-to-upstream in files view #5152
+41
−39
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The files controller was incorrectly using opts.Config.Commits.ViewResetOptions (default "g") for the reset-to-upstream menu, which caused the commits view's keybinding to "bleed" into the files view. This fix adds a new config option Files.ViewResetToUpstreamOptions (default "U") and uses it in the files controller, ensuring proper separation of keybindings between views. Fixes jesseduffield#5150 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]> Signed-off-by: majiayu000 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5150
Changes
ViewResetToUpstreamOptionstoKeybindingFilesConfigwith default keyUfiles_controller.goto use the Files-specific keybinding instead ofopts.Config.Commits.ViewResetOptionsThe bug was caused by the reset-to-upstream action in the files view incorrectly using
opts.Config.Commits.ViewResetOptions(the commits view config), which caused the commits view keybinding to "bleed" into the files view.