fix: push with file named like branch

#171
denolehov · Sep 29, 2022 · 2664bfe · 2664bfe
1 parent 529ed0a
commit 2664bfe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/simpleGit.ts b/src/simpleGit.ts
@@ -248,7 +248,7 @@ export class SimpleGit extends GitManager {
         const status = await this.git.status();
         const trackingBranch = status.tracking!;
         const currentBranch = status.current!;
-        const remoteChangedFiles = (await this.git.diffSummary([currentBranch, trackingBranch], (err) => this.onError(err))).changed;
+        const remoteChangedFiles = (await this.git.diffSummary([currentBranch, trackingBranch, "--"], (err) => this.onError(err))).changed;
 
         this.plugin.setState(PluginState.push);
         if (this.plugin.settings.updateSubmodules) {
@@ -269,7 +269,7 @@ export class SimpleGit extends GitManager {
         const status = await this.git.status((err) => this.onError(err));
         const trackingBranch = status.tracking!;
         const currentBranch = status.current!;
-        const remoteChangedFiles = (await this.git.diffSummary([currentBranch, trackingBranch])).changed;
+        const remoteChangedFiles = (await this.git.diffSummary([currentBranch, trackingBranch, "--"])).changed;
 
         return remoteChangedFiles !== 0;
     }