Do not throw if process exits with 0

- Ignore StandardError output - Use it only as exception text on non-zero exit code makes gitextensions#9056 less intercepting, fixes gitextensions#9462
mstv · Aug 12, 2021 · 945f370 · 945f370
1 parent d8ddc1f
commit 945f370
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/GitCommands/Git/Executable.cs b/GitCommands/Git/Executable.cs
@@ -63,7 +63,7 @@ private sealed class ProcessWrapper : IProcess
             private readonly ProcessOperation _logOperation;
             private readonly bool _redirectInput;
             private readonly bool _redirectOutput;
-            private readonly bool _throwOnErrorOutput;
+            private readonly bool _throwOnErrorExit;
 
             private MemoryStream? _emptyStream;
             private StreamReader? _emptyReader;
@@ -78,15 +78,15 @@ private sealed class ProcessWrapper : IProcess
                                   bool redirectOutput,
                                   Encoding? outputEncoding,
                                   bool useShellExecute,
-                                  bool throwOnErrorOutput)
+                                  bool throwOnErrorExit)
             {
                 Debug.Assert(redirectOutput == (outputEncoding is not null), "redirectOutput == (outputEncoding is not null)");
                 _redirectInput = redirectInput;
                 _redirectOutput = redirectOutput;
-                _throwOnErrorOutput = throwOnErrorOutput;
+                _throwOnErrorExit = throwOnErrorExit;
 
                 Encoding errorEncoding = outputEncoding;
-                if (throwOnErrorOutput)
+                if (throwOnErrorExit)
                 {
                     errorEncoding ??= Encoding.Default;
                 }
@@ -102,7 +102,7 @@ private sealed class ProcessWrapper : IProcess
                         CreateNoWindow = !createWindow,
                         RedirectStandardInput = redirectInput,
                         RedirectStandardOutput = redirectOutput,
-                        RedirectStandardError = redirectOutput || throwOnErrorOutput,
+                        RedirectStandardError = redirectOutput || throwOnErrorExit,
                         StandardOutputEncoding = outputEncoding,
                         StandardErrorEncoding = errorEncoding,
                         FileName = fileName,
@@ -150,20 +150,17 @@ private void OnProcessExit(object sender, EventArgs eventArgs)
                             int exitCode = _process.ExitCode;
                             _logOperation.LogProcessEnd(exitCode);
 
-                            if (_throwOnErrorOutput)
+                            if (_throwOnErrorExit && exitCode != 0)
                             {
                                 string errorOutput = _process.StandardError.ReadToEnd().Trim();
-                                if (exitCode != 0 || errorOutput.Length > 0)
-                                {
-                                    ExternalOperationException ex
-                                        = new(command: _process.StartInfo.FileName,
-                                              _process.StartInfo.Arguments,
-                                              _process.StartInfo.WorkingDirectory,
-                                              exitCode,
-                                              new Exception(errorOutput));
-                                    _logOperation.LogProcessEnd(ex);
-                                    _exitTaskCompletionSource.TrySetException(ex);
-                                }
+                                ExternalOperationException ex
+                                    = new(command: _process.StartInfo.FileName,
+                                            _process.StartInfo.Arguments,
+                                            _process.StartInfo.WorkingDirectory,
+                                            exitCode,
+                                            new Exception(errorOutput));
+                                _logOperation.LogProcessEnd(ex);
+                                _exitTaskCompletionSource.TrySetException(ex);
                             }
 
                             _exitTaskCompletionSource.TrySetResult(exitCode);
@@ -210,12 +207,12 @@ public StreamReader StandardError
             {
                 get
                 {
-                    if (!_redirectOutput && !_throwOnErrorOutput)
+                    if (!_redirectOutput && !_throwOnErrorExit)
                     {
                         throw new InvalidOperationException("Process was not created with redirected output.");
                     }
 
-                    if (!_throwOnErrorOutput)
+                    if (!_throwOnErrorExit)
                     {
                         return _process.StandardError;
                     }