Browse Source

fix(skills): grep -c exits 1 on zero matches, use wc -l instead

0xDarkMatter 1 month ago
parent
commit
bb0f34ee2b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      skills/git-ops/scripts/status.sh

+ 1 - 1
skills/git-ops/scripts/status.sh

@@ -128,7 +128,7 @@ fi
 if [ -n "$DEFAULT_BRANCH" ]; then
 if [ -n "$DEFAULT_BRANCH" ]; then
   MERGED_COUNT=$(git branch --merged "$DEFAULT_BRANCH" 2>/dev/null \
   MERGED_COUNT=$(git branch --merged "$DEFAULT_BRANCH" 2>/dev/null \
     | grep -v "^\*\|^\s*${DEFAULT_BRANCH}$\|^\s*master$\|^\s*main$\|^\s*trunk$" \
     | grep -v "^\*\|^\s*${DEFAULT_BRANCH}$\|^\s*master$\|^\s*main$\|^\s*trunk$" \
-    | grep -c . 2>/dev/null || echo 0)
+    | wc -l | tr -d ' ')
   if [ "$MERGED_COUNT" -gt 0 ]; then
   if [ "$MERGED_COUNT" -gt 0 ]; then
     HYGIENE_FLAGS="${HYGIENE_FLAGS}HYGIENE[2]: $MERGED_COUNT merged branch(es) not yet deleted — run: git branch --merged $DEFAULT_BRANCH\n"
     HYGIENE_FLAGS="${HYGIENE_FLAGS}HYGIENE[2]: $MERGED_COUNT merged branch(es) not yet deleted — run: git branch --merged $DEFAULT_BRANCH\n"
   fi
   fi