Fix parsing of legacy git.git commit #2098
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
The C Git source code repository itself contains a commit with bogus `gpgsig` lines: 5f549aa2f783 (pretty: %G[?GS] placeholders, 2011-10-21). Basically, this commit's headers contain a GPG signature that _should_ have been a multi-line header, but instead every line of that signature was added individually as a `gpgsig` header. Crucially, this includes a header line that starts with `gpgsig` followed by a space and that's already the end of the line. Gitoxide's commit header parser was not prepared for that. Even worse: the error message in that instance was simply empty. Let's make the parser more robust by accepting such commit headers, and add a test to verify that the commit in question _can_ be parsed by Gitoxide. Signed-off-by: Johannes Schindelin <[email protected]>
I just fixed a problem where a `gpgsig ` header line in a historical commit in the git.git repository itself was mistakenly causing a parse error. The culprit was, of course, that the header value is empty, and the existing code expected the value _not_ to be empty. Handle similar issues in other locations, too. Signed-off-by: Johannes Schindelin <[email protected]>
3afe006 to
a0660fe
Compare
Byron
approved these changes
Aug 3, 2025
|
Nice, thank you @Byron! |
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.
When trying to import Git for Windows' commit history into
jj, I noticed that I couldn't:The reason is of course git/git@5f549aa, which has incorrect commit headers:
Note the multiple
gpgsigheader lines? In particular the one that has no value? That's the problem. Unfortunately, the error message from the parser was not helpful (it was empty), but in any case, the fix is relatively obvious, I think.While at it, I looked at similar
take_till()calls and think I found similar issues in some, which are fixed in a separate commit.