added ability to have `head` file to compare against

fixed files getting into an opened & active state when it shouldnt

1 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js
index 7eccc2c82cf..3ee352309d4 100644
--- a/app/assets/javascripts/ide/stores/mutations/file.js
+++ b/app/assets/javascripts/ide/stores/mutations/file.js
@@ -132,6 +132,8 @@ export default {
       Object.assign(state.entries[path], {
         ...stagedFile,
         key: state.entries[path].key,
+        active: state.entries[path].active,
+        opened: state.entries[path].opened,
         changed: true,
       });
 
@@ -157,9 +159,7 @@ export default {
   [types.ADD_PENDING_TAB](state, { file, keyPrefix = 'pending' }) {
     const key = `${keyPrefix}-${file.key}`;
     const pendingTab = state.openFiles.find(f => f.key === key && f.pending);
-    let openFiles = state.openFiles.map(f =>
-      Object.assign(f, { active: f.key === key, opened: false }),
-    );
+    let openFiles = state.openFiles.map(f => Object.assign(f, { active: false, opened: false }));
 
     if (!pendingTab) {
       const openFile = openFiles.find(f => f.path === file.path);