-
Notifications
You must be signed in to change notification settings - Fork 25.3k
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 git-p4 decode_path() missing an assignment #1683
base: master
Are you sure you want to change the base?
Conversation
Welcome to GitGitGadgetHi @SaNeOr, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that either:
You can CC potential reviewers by adding a footer to the PR description with the following syntax:
Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel
Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):
To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
There are issues in commit 982f74f: |
There are issues in commit 4d292ed: |
There are issues in commit a63bfd7: |
There are issues in commit b1f8fe2: |
There are issues in commit baca5bd: |
There are issues in commit 8d4077b: |
a7b0b52
to
661c289
Compare
/allow |
User SaNeOr is now allowed to use GitGitGadget. |
/preview |
Error: Could not determine full name of SaNeOr |
bugfix: When using git-p4 in the python2 environment, some places decode() missing an assignment. Signed-off-by: W Sero <sane0r@outlook.com>
Error: Could not determine full name of SaNeOr |
/preview |
Preview email sent as pull.1683.git.git.1709541820393.gitgitgadget@gmail.com |
/submit |
Submitted as pull.1683.git.git.1709542455728.gitgitgadget@gmail.com To fetch this version into
To fetch this version to local tag
|
On the Git mailing list, Patrick Steinhardt wrote (reply to this): On Mon, Mar 04, 2024 at 08:54:15AM +0000, W Sero via GitGitGadget wrote:
> From: SaNeOr <sane0r@outlook.com>
>
> bugfix: When using git-p4 in the python2 environment,
> some places decode() missing an assignment.
>
> Signed-off-by: W Sero <sane0r@outlook.com>
> ---
> Fix git-p4 decode_path() missing an assignment
>
> When using git-p4 in the python2 environment, some places decode( )
> missing an assignment.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1683%2FSaNeOr%2Fmaster-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1683/SaNeOr/master-v1
> Pull-Request: https://github.com/git/git/pull/1683
>
> git-p4.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 28ab12c72b6..9fa4b9b104e 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -307,7 +307,7 @@ def decode_path(path):
> return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
> else:
> try:
> - path.decode('ascii')
> + path = path.decode('ascii')
Is this fixing an actual bug that you have encountered? I'm mostly
asking because I think this actually works as inteded: we only try to
decode the path using the specified encoding in case where it is not
representable as ASCII. If it contained e.g. Unicode characters, then
this statement here would throw and we end up decoding in the `except`
branch. Otherwise, we know that the path only contains ASCII characters
and thus we don't have to change it in the first place.
Whether that complexity is sensible might be a different question. But
it at least shouldn't result in any user visible bug, no?
Patrick
> except:
> path = path.decode(encoding, errors='replace')
> if verbose:
> @@ -3114,7 +3114,7 @@ def writeToGitStream(self, gitMode, relPath, contents):
>
> def encodeWithUTF8(self, path):
> try:
> - path.decode('ascii')
> + path = path.decode('ascii')
> except:
> encoding = 'utf8'
> if gitConfig('git-p4.pathEncoding'):
>
> base-commit: 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d
> --
> gitgitgadget
> |
User |
When using git-p4 in the python2 environment, some places decode( ) missing an assignment.
cc: Patrick Steinhardt ps@pks.im