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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Mar 14, 2019
Merged

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

merged 1 commit into from
Mar 14, 2019

Conversation

mrsdizzie
Copy link
Member

  • 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

@mrsdizzie
Fix ParsePatch function to work with quoted diff --git strings (go-gi…
911a083 
…tea#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 go-gitea#6309

* Add test for regular case while here

* Simplify string modification
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 14, 2019
@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 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
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@zeripath zeripath zeripath approved these changes

@jolheiser jolheiser jolheiser approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.7.5
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mrsdizzie @techknowlogick @zeripath @jolheiser @GiteaBot