check also stderr for errors

src/commands/git/reset.ts

@@ -29,12 +29,15 @@ interface Context {
 	title: string;
 }
 
-type Flags = '--hard' | '--soft';
+type ResetOptions = {
+	hard?: boolean;
+	soft?: boolean;
+};
 
 interface State {
 	repo: string | Repository;
 	reference: GitRevisionReference | GitTagReference;
-	flags: Flags[];
+	options: ResetOptions;
 }
 
 export interface ResetGitCommandArgs {
@@ -73,7 +76,7 @@ export class ResetGitCommand extends QuickCommand<State> {
 
 	async execute(state: ResetStepState) {
 		try {
-			await state.repo.git.reset(state.flags, state.reference.ref);
+			await state.repo.git.reset(state.options, state.reference.ref);
 		} catch (ex) {
 			Logger.error(ex, this.title);
 			void showGenericErrorMessage(ex.message);
@@ -89,8 +92,8 @@ export class ResetGitCommand extends QuickCommand<State> {
 			title: this.title,
 		};
 
-		if (state.flags == null) {
-			state.flags = [];
+		if (state.options == null) {
+			state.options = {};
 		}
 
 		let skippedStepOne = false;
@@ -159,7 +162,7 @@ export class ResetGitCommand extends QuickCommand<State> {
 				const result = yield* this.confirmStep(state as ResetStepState, context);
 				if (result === StepResultBreak) continue;
 
-				state.flags = result;
+				state.options = Object.assign({}, ...result);
 			}
 
 			endSteps(state);
@@ -169,24 +172,24 @@ export class ResetGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResultBreak : undefined;
 	}
 
-	private *confirmStep(state: ResetStepState, context: Context): StepResultGenerator<Flags[]> {
-		const step: QuickPickStep<FlagsQuickPickItem<Flags>> = this.createConfirmStep(
+	private *confirmStep(state: ResetStepState, context: Context): StepResultGenerator<ResetOptions[]> {
+		const step: QuickPickStep<FlagsQuickPickItem<ResetOptions>> = this.createConfirmStep(
 			appendReposToTitle(`Confirm ${context.title}`, state, context),
 			[
-				createFlagsQuickPickItem<Flags>(state.flags, [], {
+				createFlagsQuickPickItem<ResetOptions>([], [], {
 					label: this.title,
 					detail: `Will reset (leaves changes in the working tree) ${getReferenceLabel(
 						context.destination,
 					)} to ${getReferenceLabel(state.reference)}`,
 				}),
-				createFlagsQuickPickItem<Flags>(state.flags, ['--soft'], {
+				createFlagsQuickPickItem<ResetOptions>([], [{ soft: true }], {
 					label: `Soft ${this.title}`,
 					description: '--soft',
 					detail: `Will soft reset (leaves changes in the index and working tree) ${getReferenceLabel(
 						context.destination,
 					)} to ${getReferenceLabel(state.reference)}`,
 				}),
-				createFlagsQuickPickItem<Flags>(state.flags, ['--hard'], {
+				createFlagsQuickPickItem<ResetOptions>([], [{ hard: true }], {
 					label: `Hard ${this.title}`,
 					description: '--hard',
 					detail: `Will hard reset (discards all changes) ${getReferenceLabel(

src/env/node/git/git.ts

@@ -1603,7 +1603,7 @@ export class Git {
 		} catch (ex) {
 			const msg: string = ex?.toString() ?? '';
 			for (const [error, reason] of resetErrorAndReason) {
-				if (error.test(msg)) {
+				if (error.test(msg) || error.test(ex.stderr ?? '')) {
 					throw new ResetError(reason, ex);
 				}
 			}

src/git/actions/repository.ts

@@ -41,12 +41,12 @@ export function rebase(repo?: string | Repository, ref?: GitReference, interacti
 export function reset(
 	repo?: string | Repository,
 	ref?: GitRevisionReference | GitTagReference,
-	flags?: NonNullable<ResetGitCommandArgs['state']>['flags'],
+	options?: NonNullable<ResetGitCommandArgs['state']>['options'],
 ) {
 	return executeGitCommand({
 		command: 'reset',
-		confirm: flags == null || flags.includes('--hard'),
-		state: { repo: repo, reference: ref, flags: flags },
+		confirm: options == null || options.hard,
+		state: { repo: repo, reference: ref, options: options },
 	});
 }
 

src/git/gitProviderService.ts

@@ -1335,24 +1335,10 @@ export class GitProviderService implements Disposable {
 	}
 
 	@log()
-	async reset(repoPath: string, flags: string[], ref: string): Promise<void> {
+	async reset(repoPath: string, options: { hard?: boolean; soft?: boolean } = {}, ref: string): Promise<void> {
 		const { provider, path } = this.getProvider(repoPath);
 		if (provider.reset == null) throw new ProviderNotSupportedError(provider.descriptor.name);
 
-		const options: { hard?: boolean; soft?: boolean } = {};
-		for (const flag of flags) {
-			switch (flag) {
-				case '--hard':
-					options.hard = true;
-					break;
-				case '--soft':
-					options.soft = true;
-					break;
-				default:
-					break;
-			}
-		}
-
 		return provider.reset(path, ref, options);
 	}