Skip to content

Commit 690e871

Browse files
authored
Fix check fork details (#2806)
Fixes #2805 Due to an error in checking the details of the fork, the prompt for the fork appears repeatedly.
1 parent 2487612 commit 690e871

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

src/github/folderRepositoryManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ export class FolderRepositoryManager implements vscode.Disposable {
17781778
if (
17791779
forkDetails &&
17801780
forkDetails.isFork &&
1781-
forkDetails.parent.owner === item.remote.owner &&
1781+
forkDetails.parent.owner.login === item.remote.owner &&
17821782
forkDetails.parent.name === item.remote.repositoryName
17831783
) {
17841784
const foundforkPermission = await githubRepo.getViewerPermission();

src/github/githubRepository.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ export enum ViewerPermission {
7474
export interface ForkDetails {
7575
isFork: boolean;
7676
parent: {
77-
owner: string;
77+
owner: {
78+
login: string;
79+
};
7880
name: string;
7981
};
8082
}
@@ -551,19 +553,19 @@ export class GitHubRepository implements vscode.Disposable {
551553

552554
async getRepositoryForkDetails(): Promise<ForkDetails | undefined> {
553555
try {
554-
Logger.debug(`Fetch viewer permission - enter`, GitHubRepository.ID);
556+
Logger.debug(`Fetch repository fork details - enter`, GitHubRepository.ID);
555557
const { query, remote, schema } = await this.ensure();
556558
const { data } = await query<ForkDetailsResponse>({
557-
query: schema.GetViewerPermission,
559+
query: schema.GetRepositoryForkDetails,
558560
variables: {
559561
owner: remote.owner,
560562
name: remote.repositoryName,
561563
},
562564
});
563-
Logger.debug(`Fetch viewer permission - done`, GitHubRepository.ID);
565+
Logger.debug(`Fetch repository fork details - done`, GitHubRepository.ID);
564566
return data.repository;
565567
} catch (e) {
566-
Logger.appendLine(`GithubRepository> Unable to fetch viewer permission: ${e}`);
568+
Logger.appendLine(`GithubRepository> Unable to fetch repository fork details: ${e}`);
567569
return;
568570
}
569571
}

src/github/queries.gql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,9 @@ query GetRepositoryForkDetails($owner: String!, $name: String!) {
904904
isFork
905905
parent {
906906
name
907-
owner
907+
owner {
908+
login
909+
}
908910
}
909911
}
910912
}

0 commit comments

Comments
 (0)