Selective cache invalidation

lib/git-shell-out-strategy.js

@@ -510,14 +510,17 @@ export default class GitShellOutStrategy {
    * Branches
    */
   async getCurrentBranch() {
-    const content = await readFile(path.join(this.workingDir, '.git', 'HEAD'));
-    if (content.startsWith('ref: ')) {
+    try {
       // The common case: you're on a branch
       return {
         name: (await this.exec(['symbolic-ref', '--short', 'HEAD'])).trim(),
         isDetached: false,
       };
-    } else {
+    } catch (e) {
+      if (!/not a symbolic ref/.test(e.stdErr)) {
+        throw e;
+      }
+
       // Detached HEAD
       return {
         name: (await this.exec(['describe', '--contains', '--all', 'HEAD'])).trim(),

lib/models/file-system-change-observer.js

@@ -57,16 +57,16 @@ export default class FileSystemChangeObserver {
           const isNonGitFile = event => !event.directory.split(path.sep).includes('.git') && event.file !== '.git';
           const isWatchedGitFile = event => {
             return ['config', 'index', 'HEAD', 'MERGE_HEAD'].includes(event.file || event.newFile) ||
-              event.directory.includes(path.join('.git', 'refs', 'remotes'));
+              event.directory.includes(path.join('.git', 'refs'));
           };
           const filteredEvents = events.filter(e => isNonGitFile(e) || isWatchedGitFile(e));
           if (filteredEvents.length) {
             this.logger.showEvents(filteredEvents);
-            this.emitter.emit('did-change');
+            this.didChange(filteredEvents);
             const workdirOrHeadEvent = filteredEvents.find(e => !['config', 'index'].includes(e.file || e.newFile));
             if (workdirOrHeadEvent) {
               this.logger.showWorkdirOrHeadEvents();
-              this.emitter.emit('did-change-workdir-or-head');
+              this.didChangeWorkdirOrHead();
             }
           }
         },