Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more bug fixes on diff #34

Merged
merged 1 commit into from
Dec 23, 2022
Merged

more bug fixes on diff #34

merged 1 commit into from
Dec 23, 2022

Conversation

honglu2875
Copy link
Collaborator

@honglu2875 honglu2875 commented Dec 23, 2022

Fix various bugs of diff functions after validating with broader edge cases. This is a redo of the PR #33 (too many conflicts and I'd rather start over).

A couple behavior changes:

  • will allow omitted line range like @@ -1 +1 @@ which is supposed to default to @@ -1,1 +1,1 @@ according to https://en.wikipedia.org/wiki/Diff#Unified_format
  • will ignore GitHub warning \ No newline at end of file by replacing matching lines by empty strings (possibly taking out the next \n if exists)

There are other smaller fixes like edge behaviors in the case of ADDFILE, adding a bigger real world GitHub commit in the test cases, etc.

@herbiebradley herbiebradley changed the base branch from release/0.2.0 to main December 23, 2022 22:56
Copy link
Collaborator

@herbiebradley herbiebradley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks! I will merge this with main and just have v0.1.6 so that it's simpler.

@herbiebradley herbiebradley merged commit 85e7db8 into main Dec 23, 2022
@herbiebradley herbiebradley deleted the diff_bug_fix branch December 23, 2022 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants