Fixes Git error not returning props when ignoring

Avoids logging expected patch failure during merged detection

Author: eamodio

src/env/node/git/git.ts

@@ -326,10 +326,19 @@ export class Git {
 			};
 		} catch (ex) {
 			if (errorHandling === GitErrorHandling.Ignore) {
+				if (ex instanceof RunError) {
+					return {
+						stdout: ex.stdout as T,
+						stderr: ex.stderr as T | undefined,
+						exitCode: ex.code != null ? (typeof ex.code === 'number' ? ex.code : parseInt(ex.code, 10)) : 0,
+						cancelled: ex instanceof CancelledRunError,
+					};
+				}
+
 				return {
 					stdout: '' as T,
-					stderr: result?.stderr as T | undefined,
-					exitCode: result?.exitCode ?? 0,
+					stderr: undefined,
+					exitCode: 0,
 					cancelled: ex instanceof CancelledRunError,
 				};
 			}

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

@@ -534,14 +534,21 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 				const { env } = disposableIndex;
 
 				result = await this.git.exec(
-					{ cwd: repoPath, cancellation: cancellation, env: env, stdin: result.stdout },
+					{
+						cwd: repoPath,
+						cancellation: cancellation,
+						env: env,
+						errors: GitErrorHandling.Ignore,
+						stdin: result.stdout,
+					},
 					'apply',
 					'--cached',
 					'--reverse',
 					'--check',
 					'-',
 				);
-				if (!result.stdout.trim()) {
+
+				if (result.exitCode === 0 && !result.stdout.trim() && !result.stderr?.trim()) {
 					return { merged: true, confidence: 'medium' };
 				}
 			}