fix: does not push when no changes detected (fix #33)

Vinzent03 · Mar 13, 2021 · d016dee · d016dee
1 parent 30d8798
commit d016dee
Showing 1 changed file with 25 additions and 23 deletions.
diff --git a/main.ts b/main.ts
@@ -98,16 +98,7 @@ export default class ObsidianGit extends Plugin {
         this.addCommand({
             id: "push",
             name: "Commit *all* changes and push to remote repository",
-            callback: async () => {
-                const changedFiles = await this.getFilesChanged();
-
-                if (!changedFiles.length) {
-                    this.displayMessage("No changes detected");
-                    this.setState(PluginState.idle);
-                    return;
-                }
-                await this.createBackup();
-            }
+            callback: () => this.createBackup()
         });
     }
     async onunload() {
@@ -136,38 +127,49 @@ export default class ObsidianGit extends Plugin {
     }
 
     async createBackup() {
-        const changedFiles = await this.getFilesChanged();
+        this.setState(PluginState.status);
+        const status = await this.git.status();
 
-        if (changedFiles.length === 0) {
+        const currentBranch = status.current;
+        const trackingBranch = status.tracking;
+
+        if (!trackingBranch) {
+            this.displayError("Did not push. No tracking branch is set!", 10000);
             this.setState(PluginState.idle);
             return;
         }
 
-        await this.add();
-        await this.commit();
-        this.displayMessage(`Committed ${changedFiles.length} files`);
+        const changedFiles = status.files;
+
+
+        if (changedFiles.length !== 0) {
+            await this.add();
+            await this.commit();
+            this.displayMessage(`Committed ${changedFiles.length} files`);
+        }
+
+        const allChangedFiles = (await this.git.diffSummary([currentBranch, trackingBranch])).files;
+
+        if (allChangedFiles.length === 0) {
+            this.displayMessage("No changes detected");
+            this.setState(PluginState.idle);
+            return;
+        }
 
         if (!this.settings.disablePush) {
             if (this.settings.pullBeforePush) {
                 await this.pull();
             }
             await this.push();
-            this.displayMessage(`Pushed ${changedFiles.length} files to remote`);
+            this.displayMessage(`Pushed ${allChangedFiles.length} files to remote`);
         }
 
         this.lastUpdate = Date.now();
         this.setState(PluginState.idle);
     }
 
 
-
     // region: main methods
-    async getFilesChanged(): Promise<FileStatusResult[]> {
-        this.setState(PluginState.status);
-        const status = await this.git.status();
-        return status.files;
-    }
-
     async add(): Promise<void> {
         this.setState(PluginState.add);
         await this.git.add(