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.

Sign up for GitHub

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

Fixed non-ascii git branch name garbled. #796

Merged
merged 4 commits into from
Oct 2, 2020
Merged

Fixed non-ascii git branch name garbled. #796

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4cd496
Fixed non-ascii branch name garbled.
Sep 30, 2020
aa58e39
Fixed single byte Tests in TabExpansion
Sep 30, 2020
e439c99
Avoid re-fetch git branch name when IOException
Oct 1, 2020
3d212c7
Accept the owner advice in Utils.ps1
Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/Utils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@ function Invoke-Utf8ConsoleCommand([ScriptBlock]$cmd) {
# A native executable that writes to stderr AND has its stderr redirected will generate non-terminating
# error records if the user has set $ErrorActionPreference to Stop. Override that value in this scope.
$ErrorActionPreference = 'Continue'
if ($currentEncoding.IsSingleByte) {
try { [Console]::OutputEncoding = [Text.Encoding]::UTF8 } catch [System.IO.IOException] {}
}

try { [Console]::OutputEncoding = [Text.Encoding]::UTF8 } catch [System.IO.IOException] {}
& $cmd
}
finally {
if ($currentEncoding.IsSingleByte) {
try { [Console]::OutputEncoding = $currentEncoding } catch [System.IO.IOException] {}
}

try { [Console]::OutputEncoding = $currentEncoding } catch [System.IO.IOException] {}

# Clear out stderr output that was added to the $Error collection, putting those errors in a module variable
if ($global:Error.Count -gt $errorCount) {
$numNewErrors = $global:Error.Count - $errorCount
Expand Down