fix(git): use dash-prefixed short opts in CHECKOUT_SHORT_OPTS_WITH_VALUE and replace hasCheckoutForceFlag with extractShortOpts

Author: kenryu42

dist/bin/cc-safety-net.js

@@ -2563,7 +2563,7 @@ var CHECKOUT_OPTS_WITH_VALUE = new Set([
   "--unified"
 ]);
 var CHECKOUT_OPTS_WITH_OPTIONAL_VALUE = new Set(["--recurse-submodules", "--track", "-t"]);
-var CHECKOUT_SHORT_OPTS_WITH_VALUE = new Set(["b", "B", "U"]);
+var CHECKOUT_SHORT_OPTS_WITH_VALUE = new Set(["-b", "-B", "-U"]);
 var SWITCH_SHORT_OPTS_WITH_VALUE = new Set(["-c", "-C"]);
 var CHECKOUT_KNOWN_OPTS_NO_VALUE = new Set([
   "-q",
@@ -2678,7 +2678,10 @@ function extractGitSubcommandAndRest(tokens) {
 }
 function analyzeGitCheckout(tokens) {
   const { index: doubleDashIdx, before: beforeDash } = splitAtDoubleDash(tokens);
-  if (hasCheckoutForceFlag(beforeDash)) {
+  const shortOpts = extractShortOpts(beforeDash, {
+    shortOptsWithValue: CHECKOUT_SHORT_OPTS_WITH_VALUE
+  });
+  if (beforeDash.includes("--force") || shortOpts.has("-f")) {
     return REASON_CHECKOUT_FORCE;
   }
   for (const token of tokens) {
@@ -2705,30 +2708,6 @@ function analyzeGitCheckout(tokens) {
   }
   return null;
 }
-function hasCheckoutForceFlag(tokens) {
-  for (const token of tokens) {
-    if (token === "--force") {
-      return true;
-    }
-    if (!token.startsWith("-") || token.startsWith("--") || token === "-") {
-      continue;
-    }
-    const chars = token.slice(1);
-    for (let i = 0;i < chars.length; i++) {
-      const char = chars[i];
-      if (!char || !/[a-zA-Z]/.test(char)) {
-        break;
-      }
-      if (CHECKOUT_SHORT_OPTS_WITH_VALUE.has(char)) {
-        break;
-      }
-      if (char === "f") {
-        return true;
-      }
-    }
-  }
-  return false;
-}
 function analyzeGitSwitch(tokens) {
   const { before } = splitAtDoubleDash(tokens);
   if (before.includes("--discard-changes")) {

dist/index.js

@@ -1422,7 +1422,7 @@ var CHECKOUT_OPTS_WITH_VALUE = new Set([
   "--unified"
 ]);
 var CHECKOUT_OPTS_WITH_OPTIONAL_VALUE = new Set(["--recurse-submodules", "--track", "-t"]);
-var CHECKOUT_SHORT_OPTS_WITH_VALUE = new Set(["b", "B", "U"]);
+var CHECKOUT_SHORT_OPTS_WITH_VALUE = new Set(["-b", "-B", "-U"]);
 var SWITCH_SHORT_OPTS_WITH_VALUE = new Set(["-c", "-C"]);
 var CHECKOUT_KNOWN_OPTS_NO_VALUE = new Set([
   "-q",
@@ -1537,7 +1537,10 @@ function extractGitSubcommandAndRest(tokens) {
 }
 function analyzeGitCheckout(tokens) {
   const { index: doubleDashIdx, before: beforeDash } = splitAtDoubleDash(tokens);
-  if (hasCheckoutForceFlag(beforeDash)) {
+  const shortOpts = extractShortOpts(beforeDash, {
+    shortOptsWithValue: CHECKOUT_SHORT_OPTS_WITH_VALUE
+  });
+  if (beforeDash.includes("--force") || shortOpts.has("-f")) {
     return REASON_CHECKOUT_FORCE;
   }
   for (const token of tokens) {
@@ -1564,30 +1567,6 @@ function analyzeGitCheckout(tokens) {
   }
   return null;
 }
-function hasCheckoutForceFlag(tokens) {
-  for (const token of tokens) {
-    if (token === "--force") {
-      return true;
-    }
-    if (!token.startsWith("-") || token.startsWith("--") || token === "-") {
-      continue;
-    }
-    const chars = token.slice(1);
-    for (let i = 0;i < chars.length; i++) {
-      const char = chars[i];
-      if (!char || !/[a-zA-Z]/.test(char)) {
-        break;
-      }
-      if (CHECKOUT_SHORT_OPTS_WITH_VALUE.has(char)) {
-        break;
-      }
-      if (char === "f") {
-        return true;
-      }
-    }
-  }
-  return false;
-}
 function analyzeGitSwitch(tokens) {
   const { before } = splitAtDoubleDash(tokens);
   if (before.includes("--discard-changes")) {

src/core/rules-git.ts

@@ -54,7 +54,7 @@ const CHECKOUT_OPTS_WITH_VALUE = new Set([
 ]);
 
 const CHECKOUT_OPTS_WITH_OPTIONAL_VALUE = new Set(['--recurse-submodules', '--track', '-t']);
-const CHECKOUT_SHORT_OPTS_WITH_VALUE = new Set(['b', 'B', 'U']);
+const CHECKOUT_SHORT_OPTS_WITH_VALUE = new Set(['-b', '-B', '-U']);
 const SWITCH_SHORT_OPTS_WITH_VALUE = new Set(['-c', '-C']);
 
 const CHECKOUT_KNOWN_OPTS_NO_VALUE = new Set([
@@ -188,8 +188,11 @@ function extractGitSubcommandAndRest(tokens: readonly string[]): {
 
 function analyzeGitCheckout(tokens: readonly string[]): string | null {
   const { index: doubleDashIdx, before: beforeDash } = splitAtDoubleDash(tokens);
+  const shortOpts = extractShortOpts(beforeDash, {
+    shortOptsWithValue: CHECKOUT_SHORT_OPTS_WITH_VALUE,
+  });
 
-  if (hasCheckoutForceFlag(beforeDash)) {
+  if (beforeDash.includes('--force') || shortOpts.has('-f')) {
     return REASON_CHECKOUT_FORCE;
   }
 
@@ -222,34 +225,6 @@ function analyzeGitCheckout(tokens: readonly string[]): string | null {
   return null;
 }
 
-function hasCheckoutForceFlag(tokens: readonly string[]): boolean {
-  for (const token of tokens) {
-    if (token === '--force') {
-      return true;
-    }
-
-    if (!token.startsWith('-') || token.startsWith('--') || token === '-') {
-      continue;
-    }
-
-    const chars = token.slice(1);
-    for (let i = 0; i < chars.length; i++) {
-      const char = chars[i];
-      if (!char || !/[a-zA-Z]/.test(char)) {
-        break;
-      }
-      if (CHECKOUT_SHORT_OPTS_WITH_VALUE.has(char)) {
-        break;
-      }
-      if (char === 'f') {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
 function analyzeGitSwitch(tokens: readonly string[]): string | null {
   const { before } = splitAtDoubleDash(tokens);
 

tests/core/rules-git.test.ts

@@ -57,10 +57,18 @@ describe('git checkout', () => {
     assertAllowed('git checkout -bnew-branch');
   });
 
+  test('git checkout -bfeature allowed', () => {
+    assertAllowed('git checkout -bfeature');
+  });
+
   test('git checkout -Bnew-branch allowed', () => {
     assertAllowed('git checkout -Bnew-branch');
   });
 
+  test('git checkout -qbfeature allowed', () => {
+    assertAllowed('git checkout -qbfeature');
+  });
+
   test('git checkout ref pathspec blocked', () => {
     assertBlocked('git checkout HEAD file.txt', 'multiple positional args');
   });