Fix tree object modes and ordering#17
Open
one-pyy wants to merge 1 commit into
Open
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
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.
Summary
Fix Git tree objects generated from the worktree so they pass remote fsck checks:
GitTreeentries using Git tree ordering before hashing/serializingMotivation
GitJournal mobile sync can create commits locally with malformed tree objects. When those objects are pushed to GitHub, GitHub rejects the pack with errors such as:
This showed up in GitJournal as
malformed unpack status: 001dunpack index-pack failed. I added more detail to the related GitJournal issue here:GitJournal/GitJournal#963 (comment)
Details
GitIndexEntry.fromFSpreviously usedFileStat.modedirectly. On platforms such as Android/Linux this can include filesystem file type and permission bits that are not valid Git tree modes. This PR maps filesystem modes to100644or100755before they are written to the index.GitTree.createnow sorts entries before computing the tree hash. Directories are compared asname/, matching Git tree ordering.Tests