fix: ask for upstream branch in backup

denolehov · Mar 14, 2024 · d1143f7 · d1143f7
1 parent 6a89424
commit d1143f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/gitManager/simpleGit.ts b/src/gitManager/simpleGit.ts
@@ -501,8 +501,11 @@ export class SimpleGit extends GitManager {
             return true;
         }
         const status = await this.git.status((err) => this.onError(err));
-        const trackingBranch = status.tracking!;
+        const trackingBranch = status.tracking;
         const currentBranch = status.current!;
+        if (!trackingBranch) {
+            return false;
+        }
         const remoteChangedFiles = (
             await this.git.diffSummary([currentBranch, trackingBranch, "--"])
         ).changed;

diff --git a/src/main.ts b/src/main.ts
@@ -443,7 +443,7 @@ export default class ObsidianGit extends Plugin {
         this.addCommand({
             id: "set-upstream-branch",
             name: "Set upstream branch",
-            callback: async () => this.setUpsreamBranch(),
+            callback: async () => this.setUpstreamBranch(),
         });
 
         this.addCommand({
@@ -995,12 +995,16 @@ export default class ObsidianGit extends Plugin {
                 requestCustomMessage,
                 commitMessage,
             }))
-        )
+        ) {
             return;
+        }
 
         if (!this.settings.disablePush) {
             // Prevent plugin to pull/push at every call of createBackup. Only if unpushed commits are present
-            if (await this.gitManager.canPush()) {
+            if (
+                (await this.remotesAreSet()) &&
+                (await this.gitManager.canPush())
+            ) {
                 if (
                     this.settings.syncMethod != "reset" &&
                     this.settings.pullBeforePush
@@ -1409,12 +1413,12 @@ export default class ObsidianGit extends Plugin {
         }
         if (!(await this.gitManager.branchInfo()).tracking) {
             new Notice("No upstream branch is set. Please select one.");
-            return await this.setUpsreamBranch();
+            return await this.setUpstreamBranch();
         }
         return true;
     }
 
-    async setUpsreamBranch(): Promise<boolean> {
+    async setUpstreamBranch(): Promise<boolean> {
         const remoteBranch = await this.selectRemoteBranch();
 
         if (remoteBranch == undefined) {