git-watchtower 1.9.6 → 1.9.8

package/bin/git-watchtower.js

@@ -1691,11 +1691,17 @@ async function pollGitChanges() {
     for (const knownName of knownBranchNames) {
       if (!fetchedBranchNames.has(knownName)) {
         // This branch was deleted from remote
+        // Check if already present in allBranches (avoid duplicates)
+        const alreadyInList = allBranches.some(b => b.name === knownName);
+        if (alreadyInList) continue;
+
         const existingInList = currentBranches.find(b => b.name === knownName);
-        if (existingInList && !existingInList.isDeleted) {
-          existingInList.isDeleted = true;
-          existingInList.deletedAt = now;
-          addLog(`Branch deleted: ${knownName}`, 'warning');
+        if (existingInList) {
+          if (!existingInList.isDeleted) {
+            existingInList.isDeleted = true;
+            existingInList.deletedAt = now;
+            addLog(`Branch deleted: ${knownName}`, 'warning');
+          }
           // Keep it in the list temporarily
           allBranches.push(existingInList);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {

package/src/ui/renderer.js

@@ -194,12 +194,12 @@ function renderBranchList(state, write) {
     const aheadBehind = state.aheadBehindCache ? state.aheadBehindCache.get(branch.name) : null;
 
     // Diff stats: two right-justified columns, always reserving space for alignment
-    // Col 1: "+N/-N commits" right-justified in 16 chars
-    // Col 2: "+N/-N lines"   right-justified in 14 chars
-    // Total: 16 + 1(gap) + 14 + 1(gap) = 32 chars always reserved
-    const COL_COMMITS = 16;
-    const COL_LINES = 14;
-    const DIFF_TAG_FIXED_LEN = COL_COMMITS + 1 + COL_LINES + 1; // 32 total
+    // Col 1: "+N/-N commits" right-justified in 18 chars (accommodates e.g. "+18/-967 commits")
+    // Col 2: "+N/-N lines"   right-justified in 18 chars (accommodates e.g. "+3.5k/-1.9k lines")
+    // Total: 18 + 1(gap) + 18 + 1(gap) = 38 chars always reserved
+    const COL_COMMITS = 18;
+    const COL_LINES = 18;
+    const DIFF_TAG_FIXED_LEN = COL_COMMITS + 1 + COL_LINES + 1; // 38 total
     let diffTag = ' '.repeat(DIFF_TAG_FIXED_LEN); // blank by default for alignment
     if (!isBranchBase && !branch.isDeleted && aheadBehind) {
       const a = aheadBehind.ahead;