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

Fix ParsePatch function to work with quoted diff --git strings (#6323) #6332

Merged
merged 1 commit into from Mar 14, 2019

Conversation

5 participants
@mrsdizzie
Copy link
Contributor

mrsdizzie commented Mar 14, 2019

  • Fix ParsePatch to work properly with quoted diff --git string

Currently ParsePatch fails when a diff contains a quoted diff line like:

diff --git "a/file" "b/file"

This patch makes it properly parse the line when that happens.

Fixes #6309

  • Add test for regular case while here

  • Simplify string modification

Fix ParsePatch function to work with quoted diff --git strings (#6323)
* Fix ParsePatch to work properly with quoted diff --git string

Currently ParsePatch fails when a diff contains a quoted diff line like:

diff --git "a/file" "b/file"

This patch makes it properly parse the line when that happens.

Fixes #6309

* Add test for regular case while here

* Simplify string modification

@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Mar 14, 2019

@techknowlogick techknowlogick added this to the 1.7.5 milestone Mar 14, 2019

@zeripath zeripath merged commit b76d899 into go-gitea:release/v1.7 Mar 14, 2019

2 checks passed

approvals/lgtm this commit looks good
continuous-integration/drone/pr the build was successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.