Fix the staging issue with git-prolly #51
Merged
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
Problem Identified The staging area (HashMap<Vec<u8>, Option<Vec<u8>>>) was being created fresh on each command invocation, causing staged changes to be lost between commands. Solution Implemented 1. Added staging area persistence: Created save_staging_area() and load_staging_area() methods that serialize/deserialize the staging area to/from .git/PROLLY_STAGING file 2. Fixed HEAD reference updates: Implemented proper update_head() method that writes branch references and HEAD file 3. Updated all staging operations: Modified insert(), update(), delete(), and checkout() to persist staging area changes 4. Fixed commit flow: Ensured staging area is cleared after successful commits
The issue was that the original implementation was creating a Git tree with a null ObjectId placeholder, which resulted in the prolly_tree_root file being deleted during staging. Now it properly creates a real Git blob containing the serialized ProllyTree root and reconstructs the tree correctly when loading from HEAD.
…nd" after committing data The problem had three root causes: 1. Missing config save after commit - Issue: The commit() function wasn't calling save_config() after persisting the tree - Fix: Added self.tree.save_config() call in /Users/feng/github/prollytree/src/git/versioned_store.rs:216 2. Hash mappings not loaded when opening store - Issue: GitNodeStorage::new() wasn't calling load_hash_mappings() - Fix: Added storage.load_hash_mappings() call in /Users/feng/github/prollytree/src/git/storage.rs:67 3. ValueDigest deserialization incompatible with JSON - Issue: ValueDigest::deserialize() expected binary bytes but JSON config contained array format [188,78,66,...] - Fix: Updated deserialization in /Users/feng/github/prollytree/src/digest.rs:134 to handle Vec<u8> from JSON
to make sure prollytree metadata are kept
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.