Changes pull to fetch if no tracking branch

gitkraken · May 22, 2019 · d11cb57 · d11cb57
1 parent 48ffc9f
commit d11cb57
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts
@@ -340,7 +340,13 @@ export class Repository implements Disposable {
     }
 
     private async pullCore() {
-        void (await commands.executeCommand('git.pull', this.path));
+        const tracking = await this.hasTrackingBranch();
+        if (tracking) {
+            void (await commands.executeCommand('git.pull', this.path));
+        }
+        else if (configuration.getAny<boolean>('git.fetchOnPull', Uri.file(this.path))) {
+            void (await Container.git.fetch(this.path));
+        }
 
         this.fireChange(RepositoryChange.Repository);
     }