git-watchtower 1.9.11 → 1.9.13

package/bin/git-watchtower.js

@@ -1403,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 });
@@ -1747,11 +1746,15 @@ async function pollGitChanges() {
       previousBranchStates.set(branch.name, branch.commit);
     }
 
-    // Remove stale entries from previousBranchStates for branches
+    // Remove stale entries from caches for branches
     // that no longer exist in the current poll results
-    for (const name of previousBranchStates.keys()) {
-      if (!activeBranchNames.has(name)) {
-        previousBranchStates.delete(name);
+    const staleCaches = [previousBranchStates, prInfoCache, store.get('sparklineCache'), store.get('aheadBehindCache')];
+    for (const cache of staleCaches) {
+      if (!cache) continue;
+      for (const name of cache.keys()) {
+        if (!activeBranchNames.has(name)) {
+          cache.delete(name);
+        }
       }
     }
 

package/package.json

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