Mergetag parsing #29
Merged
Mergetag parsing #29
Conversation
This file contains 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
Right now, the error message when trying to parse an invalid tree or parent header is hard to pin down because it's simply a generic hex string parsing error. Make the error easier to discover in the future by adding some descriptive text to indicate to the user what the problem is.
Git contains some multiline headers, including `gpgsig`, `gpgsig-sha256`, and `mergetag` headers. These headers start with a normal line of data and then are continued after a newline by indentation with a single space, which is stripped when computing the body. Our header parsing for commits could misparse these because we use `strings.Fields`, which strips leading space. As a result, if the mergetag message contains a line starting with "tree " and then a non-hex character, we'd fail parsing since we'd attempt to parse it as a tree header. Let's fix this by using `strings.Split` instead, which doesn't strip space and therefore won't try to misparse this. The fake commit is synthesized from be122abe4bcd6d39b37892daae28c8bf5e4030fc in the Linux kernel repository. Identifying information and most of the text are removed for privacy and license reasons.
bk2204
force-pushed
the
mergetag-parsing
branch
from
bed6bc5 to
5b81d5b
Compare
chrisd8088
approved these changes
Sep 28, 2022
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.
Git contains some multiline headers, including
gpgsig,gpgsig-sha256, andmergetagheaders. These headers start with a normal line of data and then are continued after a newline by indentation with a single space, which is stripped when computing the body.Our header parsing for commits could misparse these because we use
strings.Fields, which strips leading space. As a result, if the mergetag message contains a line starting with "tree " and then a non-hex character, we'd fail parsing since we'd attempt to parse it as a tree header. Let's fix this by usingstrings.Splitinstead, which doesn't strip space and therefore won't try to misparse this.The fake commit is synthesized from be122abe4bcd6d39b37892daae28c8bf5e4030fc in the Linux kernel repository. Identifying information and most of the text are removed for privacy and license reasons.