fix: add merge commit support to validation script

- Add isSpecialCommit function to detect merge/revert/fixup commits - Skip validation for special Git commit types - Update both ESM and CommonJS versions - Remove unused printWelcome function from banner.ts

Author: thegdsks

bin/index.cjs.ts

@@ -441,6 +441,12 @@ async function handleCheckCommand() {
  console.log(commitMessage);
  console.log('');
 
+ // Check if this is a special commit that should be excluded from validation
+ if (isSpecialCommit(commitMessage)) {
+ console.log('✓ Special commit detected (merge/revert/fixup) - skipping validation');
+ process.exit(0);
+ }
+ 
  // Use inline validation logic for CommonJS compatibility
  const validation = validateCommitMessage(commitMessage, config);
 
@@ -475,6 +481,32 @@ async function handleCheckCommand() {
  }
 }
 
+function isSpecialCommit(message: string): boolean {
+ const header = message.split('\n')[0] || '';
+ 
+ // Check for merge commits
+ if (header.startsWith('Merge ')) {
+ return true;
+ }
+ 
+ // Check for revert commits
+ if (header.startsWith('Revert ')) {
+ return true;
+ }
+ 
+ // Check for fixup commits
+ if (header.startsWith('fixup! ') || header.startsWith('squash! ')) {
+ return true;
+ }
+ 
+ // Check for initial commits
+ if (header.toLowerCase().includes('initial commit')) {
+ return true;
+ }
+ 
+ return false;
+}
+
 function parseCommitMessage(message: string) {
  const lines = message.split('\n');
  const header = lines[0] || '';

scripts/check-commit.ts

@@ -48,6 +48,35 @@ function getLatestCommitMessage(): string {
  }
 }
 
+/**
+ * Check if commit message is a special Git commit type that should be excluded from validation
+ */
+function isSpecialCommit(message: string): boolean {
+ const header = message.split('\n')[0] || '';
+ 
+ // Check for merge commits
+ if (header.startsWith('Merge ')) {
+ return true;
+ }
+ 
+ // Check for revert commits
+ if (header.startsWith('Revert ')) {
+ return true;
+ }
+ 
+ // Check for fixup commits
+ if (header.startsWith('fixup! ') || header.startsWith('squash! ')) {
+ return true;
+ }
+ 
+ // Check for initial commits
+ if (header.toLowerCase().includes('initial commit')) {
+ return true;
+ }
+ 
+ return false;
+}
+
 /**
  * Parse a conventional commit message
  */
@@ -155,6 +184,12 @@ async function main() {
  console.log(commitMessage);
  console.log('');
 
+ // Check if this is a special commit that should be excluded from validation
+ if (isSpecialCommit(commitMessage)) {
+ console.log('✓ Special commit detected (merge/revert/fixup) - skipping validation');
+ process.exit(0);
+ }
+ 
  // Parse commit message
  const parsed = parseCommitMessage(commitMessage);
 
@@ -197,4 +232,4 @@ if (import.meta.url === `file://${process.argv[1]}`) {
  main();
 }
 
-export { validateCommit, parseCommitMessage, loadConfig };
+export { validateCommit, parseCommitMessage, loadConfig, isSpecialCommit };

src/ui/banner.ts

@@ -116,14 +116,6 @@ export async function typeWriter(text: string, delay: number = 50): Promise<void
  console.log('');
 }
 
-export function printWelcome(): void {
- console.log(chalk.hex(BRAND_COLORS.muted)('┌─────────────────────────────────────────────────────────────────────────────────────────┐'));
- console.log(chalk.hex(BRAND_COLORS.muted)('│') + chalk.hex(BRAND_COLORS.primary).bold(' Welcome to Commitweave! 🧶 ') + chalk.hex(BRAND_COLORS.muted)('│'));
- console.log(chalk.hex(BRAND_COLORS.muted)('│') + chalk.white(' A modern CLI for smart, structured git commits ') + chalk.hex(BRAND_COLORS.muted)('│'));
- console.log(chalk.hex(BRAND_COLORS.muted)('│') + chalk.hex(BRAND_COLORS.accent)(' Powered by GLINR STUDIOS ') + chalk.hex(BRAND_COLORS.muted)('│'));
- console.log(chalk.hex(BRAND_COLORS.muted)('└─────────────────────────────────────────────────────────────────────────────────────────┘'));
- console.log('');
-}
 
 export function printFeatureHighlight(): void {
  console.log(chalk.hex(BRAND_COLORS.accent)('✨ Features:'));