dugite-extra
Advanced tools
Comparing version 0.0.1-alpha.10 to 0.0.1-alpha.11
@@ -83,4 +83,4 @@ "use strict"; | ||
args = progressCallback | ||
? ['fetch', '--progress', '--prune', remote] | ||
: ['fetch', '--prune', remote]; | ||
? ['fetch', '--progress', remote] | ||
: ['fetch', remote]; | ||
return [4 /*yield*/, git_1.git(args, repositoryPath, 'fetch', opts)]; | ||
@@ -87,0 +87,0 @@ case 1: |
@@ -81,4 +81,4 @@ "use strict"; | ||
args = progressCallback | ||
? ['pull', '--no-rebase', '--progress', remote] | ||
: ['pull', '--no-rebase', remote]; | ||
? ['pull', '--progress', remote] | ||
: ['pull', remote]; | ||
return [4 /*yield*/, git_1.git(args, repositoryPath, 'pull', opts)]; | ||
@@ -85,0 +85,0 @@ case 1: |
@@ -73,5 +73,2 @@ "use strict"; | ||
]; | ||
if (!remoteBranch) { | ||
args.push('--set-upstream'); | ||
} | ||
opts = {}; | ||
@@ -78,0 +75,0 @@ if (progressCallback) { |
{ | ||
"name": "dugite-extra", | ||
"version": "0.0.1-alpha.10", | ||
"version": "0.0.1-alpha.11", | ||
"description": "High-level Git commands for dugite.", | ||
@@ -5,0 +5,0 @@ "main": "lib/index", |
@@ -53,4 +53,4 @@ import { git, IGitExecutionOptions } from '../core/git'; | ||
const args = progressCallback | ||
? ['fetch', '--progress', '--prune', remote] | ||
: ['fetch', '--prune', remote]; | ||
? ['fetch', '--progress', remote] | ||
: ['fetch', remote]; | ||
@@ -57,0 +57,0 @@ await git(args, repositoryPath, 'fetch', opts); |
@@ -49,4 +49,4 @@ import { git, GitError, IGitExecutionOptions } from '../core/git'; | ||
const args = progressCallback | ||
? ['pull', '--no-rebase', '--progress', remote] | ||
: ['pull', '--no-rebase', remote]; | ||
? ['pull', '--progress', remote] | ||
: ['pull', remote]; | ||
@@ -53,0 +53,0 @@ const result = await git(args, repositoryPath, 'pull', opts); |
@@ -35,6 +35,2 @@ import { git, IGitExecutionOptions, GitError } from '../core/git'; | ||
if (!remoteBranch) { | ||
args.push('--set-upstream'); | ||
} | ||
let opts: IGitExecutionOptions = {}; | ||
@@ -41,0 +37,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
580804
10487