Removes refspec from pull

Author: axosoft-ramint

src/env/node/git/git.ts

@@ -1022,10 +1022,7 @@ export class Git {
 		}
 	}
 
-	async pull(
-		repoPath: string,
-		options: { branch?: string; remote?: string; upstream?: string; rebase?: boolean; tags?: boolean },
-	): Promise<void> {
+	async pull(repoPath: string, options: { rebase?: boolean; tags?: boolean }): Promise<void> {
 		const params = ['pull'];
 
 		if (options.tags) {
@@ -1036,11 +1033,6 @@ export class Git {
 			params.push('-r');
 		}
 
-		if (options.remote && options.branch) {
-			params.push(options.remote);
-			params.push(options.upstream ? `${options.upstream}:${options.branch}` : options.branch);
-		}
-
 		try {
 			void (await this.git<string>({ cwd: repoPath }, ...params));
 		} catch (ex) {
@@ -1077,7 +1069,7 @@ export class Git {
 				reason = PullErrorReason.TagConflict;
 			}
 
-			throw new PullError(reason, ex, options?.branch, options?.remote);
+			throw new PullError(reason, ex);
 		}
 	}
 

src/env/node/git/localGitProvider.ts

@@ -1538,26 +1538,11 @@ export class LocalGitProvider implements GitProvider, Disposable {
 
 	@gate()
 	@log()
-	async pull(
-		repoPath: string,
-		options?: { branch?: GitBranchReference; rebase?: boolean; tags?: boolean },
-	): Promise<void> {
+	async pull(repoPath: string, options?: { rebase?: boolean; tags?: boolean }): Promise<void> {
 		const scope = getLogScope();
 
-		let branch = options?.branch;
-		if (!isBranchReference(branch)) {
-			branch = await this.getBranch(repoPath);
-			if (branch == null) return undefined;
-		}
-
-		const [branchName, remoteName] = getBranchNameAndRemote(branch);
-		if (remoteName == null && branch.upstream == null) return undefined;
-
 		try {
 			await this.git.pull(repoPath, {
-				branch: branchName,
-				remote: remoteName,
-				upstream: getBranchTrackingWithoutRemote(branch),
 				rebase: options?.rebase,
 				tags: options?.tags,
 			});

src/git/errors.ts

@@ -242,17 +242,12 @@ export class PullError extends Error {
 
 	constructor(reason?: PullErrorReason, original?: Error, branch?: string, remote?: string);
 	constructor(message?: string, original?: Error);
-	constructor(
-		messageOrReason: string | PullErrorReason | undefined,
-		original?: Error,
-		branch?: string,
-		remote?: string,
-	) {
+	constructor(messageOrReason: string | PullErrorReason | undefined, original?: Error) {
 		let message;
 		let reason: PullErrorReason | undefined;
-		const baseMessage = `Unable to pull${branch ? ` branch '${branch}'` : ''}${remote ? ` from ${remote}` : ''}`;
+		const baseMessage = `Unable to pull`;
 		if (messageOrReason == null) {
-			message = 'Unable to pull';
+			message = baseMessage;
 		} else if (typeof messageOrReason === 'string') {
 			message = messageOrReason;
 			reason = undefined;

src/git/gitProviderService.ts

@@ -1386,10 +1386,7 @@ export class GitProviderService implements Disposable {
 
 	@gate()
 	@log()
-	pull(
-		repoPath: string | Uri,
-		options?: { branch?: GitBranchReference; rebase?: boolean; tags?: boolean },
-	): Promise<void> {
+	pull(repoPath: string | Uri, options?: { rebase?: boolean; tags?: boolean }): Promise<void> {
 		const { provider, path } = this.getProvider(repoPath);
 		return provider.pull(path, options);
 	}