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

Add try catch around method to guess system encoding. #5820

Merged
merged 1 commit into from Nov 27, 2018

Conversation

spdr870
Copy link
Member

@spdr870 spdr870 commented Nov 27, 2018

It crashes when trying to detect git.exe, causing this code to fail.

I got a new laptop. I wanted to install gitextensions, and I failed because of this. Needed to debug to fix this. This is not acceptable for new users.

Changes proposed in this pull request:

  • Do not crash during auto-resolve git command. Not the best solution, but did not want to refactor gitmodule close before the release.

What did I do to test the code and ensure quality:

  • Manual testing

Has been tested on (remove any that don't apply):

  • Git Extensions 3.00.rc2
  • Build 7931098 (Dirty)
  • Git 2.19.2.windows.1
  • Microsoft Windows NT 10.0.17134.0
  • .NET Framework 4.7.3221.0
  • DPI 120dpi (125% scaling)

@ghost ghost assigned spdr870 Nov 27, 2018
@ghost ghost added the status: ready label Nov 27, 2018
@spdr870 spdr870 added this to the 3.00 milestone Nov 27, 2018
@codecov
Copy link

codecov bot commented Nov 27, 2018

Codecov Report

Merging #5820 into master will increase coverage by 0.35%.
The diff coverage is 50%.

@@            Coverage Diff            @@
##           master   #5820      +/-   ##
=========================================
+ Coverage   36.95%   37.3%   +0.35%     
=========================================
  Files         620     618       -2     
  Lines       47418   47385      -33     
  Branches     6322    6299      -23     
=========================================
+ Hits        17523   17677     +154     
+ Misses      29113   28933     -180     
+ Partials      782     775       -7

@spdr870 spdr870 added type: bug 🐛 type: regression regression, normally to latest official release ❕ priority: high labels Nov 27, 2018
@drewnoakes
Copy link
Member

Should this be targetted to the 3.0 branch?

… trying to detect git.exe, causing this code to fail.
@spdr870
Copy link
Member Author

spdr870 commented Nov 27, 2018

Should this be targetted to the 3.0 branch?

Yes, rebased on 3.0, thanks!

@spdr870 spdr870 changed the base branch from master to release/3.00 November 27, 2018 21:02
@RussKie RussKie merged commit db6c0e3 into gitextensions:release/3.00 Nov 27, 2018
@ghost ghost removed the status: ready label Nov 27, 2018
@RussKie RussKie removed ❕ priority: high type: regression regression, normally to latest official release labels Nov 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants