mattmattmatt
diff --git a/‎lib/deferred-callback-queue.js
Lines changed: 0 additions & 79 deletions b/‎lib/deferred-callback-queue.js
Lines changed: 0 additions & 79 deletions
diff --git a/‎lib/git-shell-out-strategy.js
Lines changed: 1 addition & 0 deletions b/‎lib/git-shell-out-strategy.js
Lines changed: 1 addition & 0 deletions
diff --git a/‎lib/models/workdir-context.js
Lines changed: 2 additions & 7 deletions b/‎lib/models/workdir-context.js
Lines changed: 2 additions & 7 deletions
@@ -119,6 +119,7 @@ export default class GitShellOutStrategy {
       const env = {
         ...process.env,
         GIT_TERMINAL_PROMPT: '0',
+        GIT_OPTIONAL_LOCKS: '0',
         PATH: pathParts.join(path.delimiter),
       };
 
 
@@ -1,7 +1,6 @@
-import {Emitter, CompositeDisposable, Disposable} from 'event-kit';
+import {Emitter, CompositeDisposable} from 'event-kit';
 import {autobind} from 'core-decorators';
 
-import DeferredCallbackQueue from '../deferred-callback-queue';
 import Repository from './repository';
 import ResolutionProgress from './conflicts/resolution-progress';
 import FileSystemChangeObserver from './file-system-change-observer';
@@ -41,9 +40,6 @@ export default class WorkdirContext {
       ? new WorkspaceChangeObserver(theWindow, workspace, this.repository)
       : new FileSystemChangeObserver(this.repository);
     this.resolutionProgress = new ResolutionProgress();
-    this.deferredCallbackQueue = new DeferredCallbackQueue(3000, collection => {
-      this.repository.observeFilesystemChange(collection);
-    });
 
     if (promptCallback) {
       this.repository.setPromptCallback(promptCallback);
@@ -53,10 +49,9 @@ export default class WorkdirContext {
     this.subs.add(this.repository.onDidChangeState(this.repositoryChangedState));
     this.subs.add(this.observer.onDidChange(events => {
       const paths = events.map(e => e.special || e.path);
-      this.deferredCallbackQueue.push(...paths);
+      this.repository.observeFilesystemChange(paths);
     }));
     this.subs.add(this.observer.onDidChangeWorkdirOrHead(() => this.emitter.emit('did-change-workdir-or-head')));
-    this.subs.add(new Disposable(() => this.deferredCallbackQueue.destroy()));
 
     // If a pre-loaded Repository was provided, broadcast an initial state change event.
     this.repositoryChangedState({from: null, to: this.repository.state});