feat: respect push.autoSetupRemote config

close #1020

Author: Vinzent03

src/gitManager/gitManager.ts

@@ -58,7 +58,14 @@ export abstract class GitManager {
 
     abstract pull(): Promise<FileStatusResult[] | undefined>;
 
-    abstract push(): Promise<number | undefined>;
+    /**
+     * Pushes to the remote repository.
+     *
+     * @returns `numper`: number of pushed files
+     * @returns `undefined` for other states, but a notification is done elsewhere
+     * @returns `null` if push was successful, but changed files could not be determined
+     */
+    abstract push(): Promise<number | undefined | null>;
 
     abstract getUnpushedCommits(): Promise<number>;
 
@@ -87,7 +94,10 @@ export abstract class GitManager {
         value: string | number | boolean | undefined
     ): Promise<void>;
 
-    abstract getConfig(path: string): Promise<string | undefined>;
+    abstract getConfig(
+        path: string,
+        scope?: string
+    ): Promise<string | undefined>;
 
     abstract fetch(remote?: string): Promise<void>;
 

src/gitManager/simpleGit.ts

@@ -700,7 +700,7 @@ export class SimpleGit extends GitManager {
         }
     }
 
-    async push(): Promise<number | undefined> {
+    async push(): Promise<number | undefined | null> {
         this.plugin.setPluginState({ gitAction: CurrentGitAction.push });
         try {
             if (this.plugin.settings.updateSubmodules) {
@@ -714,7 +714,7 @@ export class SimpleGit extends GitManager {
                 console.log(res);
             }
             const status = await this.git.status();
-            const trackingBranch = status.tracking!;
+            const trackingBranch = status.tracking;
             const currentBranch = status.current!;
 
             if (!trackingBranch && this.plugin.settings.updateSubmodules) {
@@ -723,14 +723,16 @@ export class SimpleGit extends GitManager {
                 );
                 return undefined;
             }
-
-            const remoteChangedFiles = (
-                await this.git.diffSummary([
-                    currentBranch,
-                    trackingBranch,
-                    "--",
-                ])
-            ).changed;
+            let remoteChangedFiles: number | null = null;
+            if (trackingBranch) {
+                remoteChangedFiles = (
+                    await this.git.diffSummary([
+                        currentBranch,
+                        trackingBranch,
+                        "--",
+                    ])
+                ).changed;
+            }
 
             await this.git.env({ ...process.env, OBSIDIAN_GIT: 1 }).push();
 
@@ -938,9 +940,17 @@ export class SimpleGit extends GitManager {
         }
     }
 
-    async getConfig(path: string): Promise<string | undefined> {
-        const config = await this.git.listConfig("local");
-        const res = config.all[path];
+    async getConfig(
+        path: string,
+        scope: "local" | "global" | "all" = "local"
+    ): Promise<string | undefined> {
+        let config: simple.ConfigListSummary;
+        if (scope == "all") {
+            config = await this.git.listConfig();
+        } else {
+            config = await this.git.listConfig(scope);
+        }
+        const res = config.all[path.toLowerCase()];
         if (typeof res === "string" || res == undefined) {
             return res;
         } else {

src/main.ts

@@ -1076,7 +1076,9 @@ export default class ObsidianGit extends Plugin {
             const pushedFiles = await this.gitManager.push();
 
             if (pushedFiles !== undefined) {
-                if (pushedFiles > 0) {
+                if (pushedFiles === null) {
+                    this.displayMessage(`Pushed to remote`);
+                } else if (pushedFiles > 0) {
                     this.displayMessage(
                         `Pushed ${pushedFiles} ${
                             pushedFiles == 1 ? "file" : "files"
@@ -1272,6 +1274,13 @@ export default class ObsidianGit extends Plugin {
         if (this.settings.updateSubmodules) {
             return true;
         }
+        if (
+            this.gitManager instanceof SimpleGit &&
+            (await this.gitManager.getConfig("push.autoSetupRemote", "all")) ==
+                "true"
+        ) {
+            return true;
+        }
         if (!(await this.gitManager.branchInfo()).tracking) {
             new Notice("No upstream branch is set. Please select one.");
             return await this.setUpstreamBranch();