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

Handle incomplete diff files properly (#13662) #13668

Conversation

6543
Copy link
Member

@6543 6543 commented Nov 21, 2020

Backport of #13662

credits to @zeripath

  The code for parsing diff hunks has a bug whereby a very long line in a very long diff would not be completely read leading to an unexpected character.

  This PR ensures that the line is completely cleared

* Also allow git max line length <4096

* Add test case

Fix go-gitea#13602

Signed-off-by: Andrew Thornton <art27@cantab.net>
@6543 6543 added the type/bug label Nov 21, 2020
@6543 6543 added this to the 1.13.0 milestone Nov 21, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 22, 2020
@lafriks lafriks added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Nov 22, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 22, 2020
@6543
Copy link
Member Author

6543 commented Nov 22, 2020

🚀

@zeripath zeripath merged commit f2a3a91 into go-gitea:release/v1.13 Nov 22, 2020
@6543 6543 deleted the backport-13662_fix-incomplete-line-length_v1.13 branch November 22, 2020 16:56
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants