Add basic support for binary diffs #46
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
Codecov Report
@@ Coverage Diff @@
## master #46 +/- ##
==========================================
+ Coverage 28.12% 28.31% +0.18%
==========================================
Files 5 5
Lines 1152 1155 +3
==========================================
+ Hits 324 327 +3
+ Misses 784 783 -1
- Partials 44 45 +1
Continue to review full report at Codecov.
|
diff/parse.go
Outdated
| @@ -341,7 +341,7 @@ func (r *FileDiffReader) ReadExtendedHeaders() ([]string, error) { | |||
| func handleEmpty(fd *FileDiff) (wasEmpty bool) { | |||
| var err error | |||
| switch { | |||
| case (len(fd.Extended) == 3 || len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[3], "Binary files ")) && | |||
| case (len(fd.Extended) == 3 || len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[3], "Binary files ") || len(fd.Extended) > 4 && strings.HasPrefix(fd.Extended[3], "GIT binary patch")) && | |||
There was a problem hiding this comment.
looks like this conditional is big enough and repeated enough to be factored out?
There was a problem hiding this comment.
Made it smaller and replaced the common len check by a variable
|
Previously the file paths would be empty strings, now they are properly populated |
keegancsmith
approved these changes
May 27, 2020
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.
This adds support for parsing the cases in ./diff/testdata/sample_binary_inline.diff correctly.