fix: add confirmation when checking out file with local changes #5145
+78
−7
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
Add confirmation dialog when checking out a file from a commit that has uncommitted local changes, preventing accidental data loss. Implementation: - Check if file has staged or unstaged changes using ConfirmIf pattern - Show confirmation dialog only when local changes exist - Add i18n strings for dialog title and prompt - Add integration test to verify behavior Fixes jesseduffield#5142 Signed-off-by: majiayu000 <[email protected]>
Collaborator
|
@majiayu000 Sorry, I didn't see your PR before I started working on mine (#5154). I'll close this one, as mine also works correctly for checking out directories. |
majiayu000
deleted the
fix-5142-checkout-file-from-commit-lack-1230-1416
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
This PR fixes #5142 by adding a confirmation dialog when checking out a file from a commit that has uncommitted local changes.
Changes
pkg/gui/controllers/commits_files_controller.go:285-305ConfirmIfpattern to detect files with staged or unstaged changesCheckoutFileFromCommitTitleandCheckoutFileFromCommitPrompt) inpkg/i18n/english.goCheckoutFileFromCommitWithLocalChangesto verify the confirmation behaviorTest Plan
ConfirmIfpattern used elsewhere in the codebase (similar to PR Add confirmation for hard reset #4704)Generated with Claude Code