git-watchtower 1.9.10 → 1.9.12

package/bin/git-watchtower.js

@@ -732,6 +732,7 @@ const { ansi, box, truncate, sparkline: uiSparkline, visibleLength, stripAnsi, p
 
 // Error detection utilities imported from src/utils/errors.js
 const { ErrorHandler, isAuthError, isMergeConflict, isNetworkError } = require('../src/utils/errors');
+const { Mutex } = require('../src/utils/async');
 
 // Keyboard handling utilities imported from src/ui/keybindings.js
 const { filterBranches } = require('../src/ui/keybindings');
@@ -1402,7 +1403,6 @@ async function switchToBranch(branchName, recordHistory = true) {
     const hasLocal = localBranches.split('\n').some(b => b.trim().replace(/^\* /, '') === safeBranchName);
 
     if (hasLocal) {
-      await execGitSilent(['checkout', '--', '.'], { cwd: PROJECT_ROOT });
       await execGit(['checkout', safeBranchName], { cwd: PROJECT_ROOT });
     } else {
       await execGit(['checkout', '-b', safeBranchName, `${REMOTE_NAME}/${safeBranchName}`], { cwd: PROJECT_ROOT });
@@ -1606,8 +1606,12 @@ async function stashAndRetry() {
 // Polling
 // ============================================================================
 
+const pollMutex = new Mutex();
+
 async function pollGitChanges() {
-  if (store.get('isPolling')) return;
+  // Skip if a poll is already in progress (don't queue)
+  if (pollMutex.isLocked()) return;
+  await pollMutex.acquire();
   store.setState({ isPolling: true, pollingStatus: 'fetching' });
 
   // Casino mode: start slot reels spinning (no sound - too annoying)
@@ -1966,6 +1970,7 @@ async function pollGitChanges() {
     }
   } finally {
     store.setState({ isPolling: false });
+    pollMutex.release();
     render();
   }
 }

package/package.json

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