[WIP] Fix initial git gui message encoding #665
Merged
Conversation
This file contains 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
This fix refers git-for-windows#664 After `git merge --squash` git creates .git/SQUASH_MSG (UTF-8 encoded) which contains squashed commits. When run `git gui` it copies SQUASH_MSG to PREPARE_COMMIT_MSG, but without honoring UTF-8. This leads to encoding problems on `git gui` commit prompt. The same applies on git cherry-pick conflict, where MERGE_MSG is created and then is copied to PREPARE_COMMIT_MSG. In both cases PREPARE_COMMIT_MSG must be configured to store data in UTF-8. Signed-off-by: yaras <yaras6@gmail.com>
|
Thank you! Unfortunately, it won't make it into the imminent 2.7.2 release, but the next version will have it! |
dscho
added a commit
that referenced
this pull request
Feb 23, 2016
Fix initial git gui message encoding
I'm glad I could contribute to this repository.
Sure |
dscho
added a commit
to git-for-windows/build-extra
that referenced
this pull request
Feb 24, 2016
We [now handle UTF-8 merge and squash messages correctly in Git GUI](git-for-windows/git#665). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
that referenced
this pull request
Mar 15, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Mar 18, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Mar 29, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Apr 4, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Apr 30, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
May 20, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jun 7, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jun 14, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 12, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 16, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 23, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 23, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 23, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 27, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 27, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Jul 29, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Aug 2, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Aug 2, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Sep 24, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Sep 24, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Sep 26, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 3, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 4, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 5, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 5, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 7, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 7, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 9, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 12, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 12, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 13, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 13, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 13, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 15, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 18, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 18, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 18, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Oct 20, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 26, 2016
Fix initial git gui message encoding
dscho
added a commit
that referenced
this pull request
Oct 29, 2016
Fix initial git gui message encoding
dscho
pushed a commit
that referenced
this pull request
Nov 9, 2016
Fix initial git gui message encoding
mjcheetham
pushed a commit
to mjcheetham/git
that referenced
this pull request
Jul 23, 2024
By default, GVFS Protocol-enabled Scalar clones will fall back to the
origin server if there is a network issue with the cache servers.
However (and especially for the prefetch endpoint) this may be a very
expensive operation for the origin server, leading to the user being
throttled. This shows up later in cases such as 'git push' or other web
operations.
To avoid this, create a new config option, 'gvfs.fallback', which
defaults to true. When set to 'false', pass '--no-fallback' from the
gvfs-helper client to the child gvfs-helper server process.
This will allow users who have hit this problem to avoid it in the
future. In case this becomes a more widespread problem, engineering
systems can enable the config option more broadly.
Enabling the config will of course lead to immediate failures for users,
but at least that will help diagnose the problem when it occurs instead
of later when the throttling shows up and the server load has already
passed, damage done.
This change only applies to interactions with Azure DevOps and the
GVFS Protocol.
---
* [x] This change only applies to interactions with Azure DevOps and the
GVFS Protocol.
dscho
added a commit
to dscho/git
that referenced
this pull request
Oct 21, 2024
By default, GVFS Protocol-enabled Scalar clones will fall back to the
origin server if there is a network issue with the cache servers.
However (and especially for the prefetch endpoint) this may be a very
expensive operation for the origin server, leading to the user being
throttled. This shows up later in cases such as 'git push' or other web
operations.
To avoid this, create a new config option, 'gvfs.fallback', which
defaults to true. When set to 'false', pass '--no-fallback' from the
gvfs-helper client to the child gvfs-helper server process.
This will allow users who have hit this problem to avoid it in the
future. In case this becomes a more widespread problem, engineering
systems can enable the config option more broadly.
Enabling the config will of course lead to immediate failures for users,
but at least that will help diagnose the problem when it occurs instead
of later when the throttling shows up and the server load has already
passed, damage done.
This change only applies to interactions with Azure DevOps and the
GVFS Protocol.
---
* [x] This change only applies to interactions with Azure DevOps and the
GVFS Protocol.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Commit
This fix refers #664
After
git merge --squashgit creates .git/SQUASH_MSG (UTF-8 encoded)which contains squashed commits. When run
git guiit copies SQUASH_MSGto PREPARE_COMMIT_MSG, but without honoring UTF-8. This leads to encoding
problems on
git guicommit prompt.The same applies on git cherry-pick conflict, where MERGE_MSG is created
and then is copied to PREPARE_COMMIT_MSG.
In both cases PREPARE_COMMIT_MSG must be configured to store data in UTF-8.
Signed-off-by: yaras yaras6@gmail.com
Worklist
cherry-picksquashgit-guiand if so, write some tests