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

Preparations for exceptions on git error (part 3 of 4) #9334

Merged
merged 2 commits into from Jul 10, 2021

Conversation

mstv
Copy link
Member

@mstv mstv commented Jul 4, 2021

Some of the preparations for #9056 contributed by @gerhardol and me

Proposed changes

  • Fixup GitModule.UpdateIndex: output the newline after the file name
    in order to avoid a git error message on the first file name being empty
  • AheadBehindDataProvider: Return null on non-zero git exit code

Screenshots

not affected

Test methodology

  • NUnit tests
  • manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build 35632c7
  • Git 2.31.1.windows.1
  • Microsoft Windows NT 10.0.19042.0
  • .NET 5.0.7
  • DPI 96dpi (no scaling)

✒️ I contribute this code under The Developer Certificate of Origin.

@mstv mstv self-assigned this Jul 4, 2021
GitCommands/Git/GitModule.cs Show resolved Hide resolved
@mstv mstv force-pushed the fix/6527_git_errors_prep3 branch from 35632c7 to 0568c3a Compare July 10, 2021 10:06
@mstv mstv merged commit 652db32 into gitextensions:master Jul 10, 2021
@ghost ghost added this to the 3.6 milestone Jul 10, 2021
@mstv mstv deleted the fix/6527_git_errors_prep3 branch July 10, 2021 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants