From d2fc1c1e7dfe1b591e56e51701e4a232e577fe56 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 6 Oct 2023 18:13:23 -0400 Subject: [PATCH] Removes unused flag --- src/env/node/git/localGitProvider.ts | 15 ++++++--------- src/git/gitProvider.ts | 1 - src/git/gitProviderService.ts | 3 +-- src/plus/github/githubGitProvider.ts | 1 - 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index 1573c47..98dad36 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -3856,7 +3856,6 @@ export class LocalGitProvider implements GitProvider, Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return undefined; @@ -3886,13 +3885,13 @@ export class LocalGitProvider implements GitProvider, Disposable { return { // Diff staged with HEAD (or prior if more skips) current: GitUri.fromFile(relativePath, repoPath, uncommittedStaged), - previous: await this.getPreviousUri(repoPath, uri, ref, skip - 1, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, ref, skip - 1), }; } else if (status.workingTreeStatus != null) { if (skip === 0) { return { current: GitUri.fromFile(relativePath, repoPath, undefined), - previous: await this.getPreviousUri(repoPath, uri, undefined, skip, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, undefined, skip), }; } } @@ -3905,12 +3904,12 @@ export class LocalGitProvider implements GitProvider, Disposable { const current = skip === 0 ? GitUri.fromFile(relativePath, repoPath, ref) - : (await this.getPreviousUri(repoPath, uri, undefined, skip - 1, undefined, firstParent))!; + : (await this.getPreviousUri(repoPath, uri, undefined, skip - 1))!; if (current == null || current.sha === deletedOrMissing) return undefined; return { current: current, - previous: await this.getPreviousUri(repoPath, uri, undefined, skip, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, undefined, skip), }; } @@ -3918,12 +3917,12 @@ export class LocalGitProvider implements GitProvider, Disposable { const current = skip === 0 ? GitUri.fromFile(relativePath, repoPath, ref) - : (await this.getPreviousUri(repoPath, uri, ref, skip - 1, undefined, firstParent))!; + : (await this.getPreviousUri(repoPath, uri, ref, skip - 1))!; if (current == null || current.sha === deletedOrMissing) return undefined; return { current: current, - previous: await this.getPreviousUri(repoPath, uri, ref, skip, undefined, firstParent), + previous: await this.getPreviousUri(repoPath, uri, ref, skip), }; } @@ -4053,7 +4052,6 @@ export class LocalGitProvider implements GitProvider, Disposable { ref?: string, skip: number = 0, editorLine?: number, - firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return undefined; @@ -4071,7 +4069,6 @@ export class LocalGitProvider implements GitProvider, Disposable { data = await this.git.log__file(repoPath, relativePath, ref, { argsOrFormat: GitLogParser.simpleFormat, fileMode: 'simple', - firstParent: firstParent, limit: skip + 2, ordering: configuration.get('advanced.commitOrdering'), startLine: editorLine != null ? editorLine + 1 : undefined, diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index 79ac1f0..8ad2b5c 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -372,7 +372,6 @@ export interface GitProvider extends Disposable { uri: Uri, ref: string | undefined, skip?: number, - firstParent?: boolean, ): Promise; getPreviousComparisonUrisForLine( repoPath: string, diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 89524da..ec811ed 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -1911,12 +1911,11 @@ export class GitProviderService implements Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return Promise.resolve(undefined); const { provider, path } = this.getProvider(repoPath); - return provider.getPreviousComparisonUris(path, uri, ref, skip, firstParent); + return provider.getPreviousComparisonUris(path, uri, ref, skip); } @log() diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index b202a36..6832633 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -2413,7 +2413,6 @@ export class GitHubGitProvider implements GitProvider, Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - _firstParent: boolean = false, ): Promise { if (ref === deletedOrMissing) return undefined;