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 GetFilesChangedBetween if the file name may be escaped (#23272) #23278

Merged

Conversation

GiteaBot
Copy link
Collaborator

@GiteaBot GiteaBot commented Mar 3, 2023

Backport #23272

The code for GetFilesChangedBetween uses git diff --name-only base..head to get the names of files changed between base and head however this forgets that git will escape certain values.

This PR simply switches to use -z which has the NUL character as the separator.

Ref #22568 (comment)

…23272)

The code for GetFilesChangedBetween uses `git diff --name-only
base..head` to get the names of files changed between base and head
however this forgets that git will escape certain values.

This PR simply switches to use `-z` which has the `NUL` character as the
separator.

Ref go-gitea#22568 (comment)

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@GiteaBot GiteaBot added this to the 1.18.6 milestone Mar 3, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 3, 2023
@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 3, 2023
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 3, 2023
@techknowlogick techknowlogick merged commit 2f1d968 into go-gitea:release/v1.18 Mar 4, 2023
@techknowlogick techknowlogick deleted the backport-23272-v1.18 branch March 4, 2023 07:11
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 4, 2023
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
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.

6 participants