🐛 improve git commit error reporting

fixes #21251

extensions/git/src/commands.ts

@@ -59,7 +59,7 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
 	}
 }
 
-const Commands: { commandId: string; method: Function; }[] = [];
+const Commands: { commandId: string; key: string; method: Function; }[] = [];
 
 function command(commandId: string): Function {
 	return (target: any, key: string, descriptor: any) => {
@@ -67,7 +67,7 @@ function command(commandId: string): Function {
 			throw new Error('not supported');
 		}
 
-		Commands.push({ commandId, method: descriptor.value });
+		Commands.push({ commandId, key, method: descriptor.value });
 	};
 }
 
@@ -86,7 +86,7 @@ export class CommandCenter {
 		}
 
 		this.disposables = Commands
-			.map(({ commandId, method }) => commands.registerCommand(commandId, this.createCommand(commandId, method)));
+			.map(({ commandId, key, method }) => commands.registerCommand(commandId, this.createCommand(commandId, key, method)));
 	}
 
 	@command('git.refresh')
@@ -710,8 +710,8 @@ export class CommandCenter {
 		this.outputChannel.show();
 	}
 
-	private createCommand(id: string, method: Function): (...args: any[]) => any {
-		return (...args) => {
+	private createCommand(id: string, key: string, method: Function): (...args: any[]) => any {
+		const result = (...args) => {
 			if (!this.model) {
 				window.showInformationMessage(localize('disabled', "Git is either disabled or not supported in this workspace"));
 				return;
@@ -729,12 +729,17 @@ export class CommandCenter {
 						message = localize('clean repo', "Please clean your repository working tree before checkout.");
 						break;
 					default:
-						const lines = (err.stderr || err.message || String(err))
-							.replace(/^error: /, '')
+						const hint = (err.stderr || err.message || String(err))
+							.replace(/^error: /mi, '')
+							.replace(/^> husky.*$/mi, '')
 							.split(/[\r\n]/)
-							.filter(line => !!line);
+							.filter(line => !!line)
+						[0];
+
+						message = hint
+							? localize('git error details', "Git: {0}", hint)
+							: localize('git error', "Git error");
 
-						message = lines[0] || 'Git error';
 						break;
 				}
 
@@ -752,6 +757,11 @@ export class CommandCenter {
 				}
 			});
 		};
+
+		// patch this object, so people can call methods directly
+		this[key] = result;
+
+		return result;
 	}
 
 	private resolveSCMResource(uri?: Uri): Resource | undefined {