Skip to content

Fix diff path unquoting (#12554) - #12575

Merged
lafriks merged 1 commit into
go-gitea:release/v1.12from
zeripath:backport-12554
Aug 23, 2020
Merged

lafriks merged 1 commit into
go-gitea:release/v1.12from
zeripath:backport-12554

Conversation

@zeripath

Copy link
Copy Markdown
Contributor

Backport #12554

  • Fix diff path unquoting

services/gitdiff/gitdiff.go whereby there it assumed that the path would
always be quoted on both sides

This PR simplifies the code here and uses fmt.Fscanf to parse the
strings as necessary.

Fix #12546

Signed-off-by: Andrew Thornton art27@cantab.net

Signed-off-by: Andrew Thornton art27@cantab.net

Backport go-gitea#12554

* Fix diff path unquoting

services/gitdiff/gitdiff.go whereby there it assumed that the path would
always be quoted on both sides

This PR simplifies the code here and uses fmt.Fscanf to parse the
strings as necessary.

Fix go-gitea#12546

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Add testcase as per @mrsdizzie

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.12.4 milestone Aug 23, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Aug 23, 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 Aug 23, 2020
@lafriks
lafriks merged commit 4a548a0 into go-gitea:release/v1.12 Aug 23, 2020
@zeripath
zeripath deleted the backport-12554 branch September 2, 2020 20:42
@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.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants