Fixes incorrect error handling

Author: eamodio

src/env/node/git/git.ts

@@ -896,7 +896,7 @@ export class Git {
 			);
 			return result.stdout;
 		} catch (ex) {
-			if (ex instanceof RunError && ex.stdout) {
+			if (ex instanceof GitError && ex.stdout) {
 				return ex.stdout;
 			}
 
@@ -1475,9 +1475,9 @@ export class Git {
 			}
 		} catch (ex) {
 			if (
-				ex instanceof RunError &&
-				ex.stdout.includes('Saved working directory and index state') &&
-				ex.stderr.includes('Cannot remove worktree changes')
+				ex instanceof GitError &&
+				ex.stdout?.includes('Saved working directory and index state') &&
+				ex.stderr?.includes('Cannot remove worktree changes')
 			) {
 				throw new StashPushError(StashPushErrorReason.ConflictingStagedAndUnstagedLines);
 			}

src/env/node/git/sub-providers/branches.ts

@@ -39,9 +39,8 @@ import { normalizePath } from '../../../../system/path';
 import { getSettledValue } from '../../../../system/promise';
 import { maybeStopWatch } from '../../../../system/stopwatch';
 import type { Git } from '../git';
-import { GitErrors, gitLogDefaultConfigs } from '../git';
+import { GitError, GitErrors, gitLogDefaultConfigs } from '../git';
 import type { LocalGitProvider } from '../localGitProvider';
-import { RunError } from '../shell.errors';
 
 const emptyPagedResult: PagedResult<any> = Object.freeze({ values: [] });
 
@@ -612,7 +611,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 						scope,
 						`Unable to merge '${branch}' and '${targetBranch}' as they have no common ancestor`,
 					);
-				} else if (ex instanceof RunError) {
+				} else if (ex instanceof GitError) {
 					data = ex.stdout;
 				} else {
 					Logger.error(ex, scope);

src/env/node/git/sub-providers/stash.ts

@@ -22,8 +22,7 @@ import { log } from '../../../../system/decorators/log';
 import { join, map, min, skip } from '../../../../system/iterable';
 import { getSettledValue } from '../../../../system/promise';
 import type { Git } from '../git';
-import { maxGitCliLength } from '../git';
-import { RunError } from '../shell.errors';
+import { GitError, maxGitCliLength } from '../git';
 import { createCommitFileset } from './commits';
 
 const stashSummaryRegex =
@@ -54,9 +53,9 @@ export class StashGitSubProvider implements GitStashSubProvider {
 
 				if (
 					(msg.includes('Auto-merging') && msg.includes('CONFLICT')) ||
-					(ex instanceof RunError &&
-						((ex.stdout.includes('Auto-merging') && ex.stdout.includes('CONFLICT')) ||
-							ex.stdout.includes('needs merge')))
+					(ex instanceof GitError &&
+						((ex.stdout?.includes('Auto-merging') && ex.stdout.includes('CONFLICT')) ||
+							ex.stdout?.includes('needs merge')))
 				) {
 					void window.showInformationMessage('Stash applied with conflicts');