fix: remove git clean and reset --hard from checkpoint restore #6297
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.
This PR addresses the critical data loss issue reported in #6209 by removing the dangerous
git cleanandgit reset --hardcommands from the checkpoint restoration process.Changes Made
git clean -d -fcommand that was forcefully deleting all untracked filesgit reset --hardcommand that could cause data lossTechnical Details
The new implementation uses:
git ls-treeto get the list of files in the target commitgit checkoutwith specific file paths to restore only tracked filesgit rmto remove files that exist in the working directory but not in the target commitThis approach ensures that user data in untracked files is never lost during checkpoint restoration.
Testing
All existing tests pass, including the specific test case for handling file deletions.
Fixes #6209
Important
Removes
git cleanandgit reset --hardfrom checkpoint restoration inShadowCheckpointService.tsto prevent data loss, using a safer method to restore tracked files.git clean -d -fandgit reset --hardfrom checkpoint restoration inShadowCheckpointService.ts.git ls-treeto list files in target commit.git checkoutto restore tracked files.git rmto remove files not in target commit.This description was created by
for ae00f6e. You can customize this summary. It will automatically update as commits are pushed.