Merge pull request #829 from ianhi/issue828

don't check for changed files when checking out a new branch
jupyterlab · Nov 26, 2020 · 3b6613a · 3b6613a
2 parents 1a57cab + f7d0bb2
commit 3b6613a
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/model.ts b/src/model.ts
@@ -384,15 +384,17 @@ export class GitExtension implements IGitExtension {
       'git:checkout',
       async () => {
         let changes;
-        if (body.checkout_branch) {
-          changes = await this._changedFiles(
-            this._currentBranch.name,
-            body.branchname
-          );
-        } else if (body.filename) {
-          changes = { files: [body.filename] };
-        } else {
-          changes = await this._changedFiles('WORKING', 'HEAD');
+        if (!body.new_check) {
+          if (body.checkout_branch && !body.new_check) {
+            changes = await this._changedFiles(
+              this._currentBranch.name,
+              body.branchname
+            );
+          } else if (body.filename) {
+            changes = { files: [body.filename] };
+          } else {
+            changes = await this._changedFiles('WORKING', 'HEAD');
+          }
         }
 
         const d = await requestAPI<Git.ICheckoutResult>(
@@ -401,7 +403,7 @@ export class GitExtension implements IGitExtension {
           body
         );
 
-        changes.files?.forEach(file => this._revertFile(file));
+        changes?.files?.forEach(file => this._revertFile(file));
         return d;
       }
     );