fixup! line patching exclude throw on errors

gitextensions · May 10, 2021 · 42e27c7 · 42e27c7
1 parent 256da72
commit 42e27c7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/GitUI/Editor/FileViewer.cs b/GitUI/Editor/FileViewer.cs
@@ -1455,7 +1455,7 @@ public void StageSelectedLines(bool stage)
                 { !stage, "--reverse" }
             };
 
-            string output = Module.GitExecutable.GetOutput(args, patch);
+            string output = Module.GitExecutable.GetOutput(args, patch, throwOnErrorOutput: false);
             ProcessApplyOutput(output, patch, patchUpdateDiff: true);
         }
 
@@ -1525,7 +1525,7 @@ public void ResetNoncommittedSelectedLines()
                 { currentItemStaged, "--reverse --index" }
             };
 
-            string output = Module.GitExecutable.GetOutput(args, patch);
+            string output = Module.GitExecutable.GetOutput(args, patch, throwOnErrorOutput: false);
             if (EnvUtils.RunningOnWindows())
             {
                 // remove file mode warnings
@@ -1582,7 +1582,7 @@ private void ApplySelectedLines(bool allFile, bool reverse)
                 "--whitespace=nowarn"
             };
 
-            string output = Module.GitExecutable.GetOutput(args, patch);
+            string output = Module.GitExecutable.GetOutput(args, patch, throwOnErrorOutput: false);
             ProcessApplyOutput(output, patch);
         }