Merge pull request #64619 from Microsoft/rmacfarlane/git-apply

Add GitErrorCode to apply command

extensions/git/src/api/git.d.ts

@@ -214,4 +214,5 @@ export const enum GitErrorCodes {
 	WrongCase = 'WrongCase',
 	CantLockRef = 'CantLockRef',
 	CantRebaseMultipleBranches = 'CantRebaseMultipleBranches',
+	PatchDoesNotApply = 'PatchDoesNotApply'
 }
\ No newline at end of file

extensions/git/src/git.ts

@@ -829,7 +829,15 @@ export class Repository {
 			args.push('-R');
 		}
 
-		await this.run(args);
+		try {
+			await this.run(args);
+		} catch (err) {
+			if (/patch does not apply/.test(err.stderr)) {
+				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
+			}
+
+			throw err;
+		}
 	}
 
 	async diff(cached = false): Promise<string> {