Allow to merge if file path contains " or \ (#8629)#8772
Merged
Conversation
* if a filename in a repository contains " or \ the owner can't merge pull request with this files because "git diff-tree" adds double quotes to that filepath example: filepath is ab"cd but "git diff-tree" returns "ab\"cd" now, when the owner click "Merge Pull Request" button the server returns 500 this commit fix it Signed-off-by: Ilya Pavlov <ilux@cpan.org> * add -z option to getDiffTree escape spec symbols for sparse-checkout Signed-off-by: Ilya Pavlov <ilux@cpan.org> * go fmt Signed-off-by: Ilya Pavlov <ilux@cpan.org> * typo Signed-off-by: Ilya Pavlov <ilux@cpan.org> * escape '\' escape all spaces and '!' * use regexp.ReplaceAllString() Signed-off-by: Ilya Pavlov <ilux@cpan.org> * strings.ReplaceAll was added in go 1.12 Signed-off-by: Ilya Pavlov <ilux@cpan.org> * add '\' to regexp.MustCompile Signed-off-by: Ilya Pavlov <ilux@cpan.org>
Member
|
I don't think we will release more 1.9 releases if only for critical security issues |
Contributor
Author
|
I thought I'd put it out there as a possible pr given we haven't released 1.10 yet. |
guillep2k
approved these changes
Nov 1, 2019
6543
approved these changes
Nov 1, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport #8629 on to release/v1.9
because "git diff-tree" adds double quotes to that filepath
example: filepath is ab"cd but "git diff-tree" returns "ab"cd"
now, when the owner click "Merge Pull Request" button the server returns 500
this commit fix it
Signed-off-by: Ilya Pavlov ilux@cpan.org
escape spec symbols for sparse-checkout
Signed-off-by: Ilya Pavlov ilux@cpan.org
Signed-off-by: Ilya Pavlov ilux@cpan.org
Signed-off-by: Ilya Pavlov ilux@cpan.org
escape ''
escape all spaces and '!'
use regexp.ReplaceAllString()
Signed-off-by: Ilya Pavlov ilux@cpan.org
Signed-off-by: Ilya Pavlov ilux@cpan.org
Signed-off-by: Ilya Pavlov ilux@cpan.org
Please check the following:
masterbranch, pull requests on release branches are only allowed for bug fixes.You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.