Fixes initial patch repo location state on cloud patch open

gitkraken · Nov 8, 2023 · 61b51c7 · 61b51c7
1 parent 9d4de01
commit 61b51c7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/plus/drafts/draftsService.ts b/src/plus/drafts/draftsService.ts
@@ -479,7 +479,10 @@ export class DraftService implements Disposable {
 
 		const [contentsResult, repositoryResult] = await Promise.allSettled([
 			this.getPatchContentsCore(patch.secureLink),
-			this.container.repositoryIdentity.getRepositoryOrIdentity(patch.gkRepositoryId),
+			this.container.repositoryIdentity.getRepositoryOrIdentity(patch.gkRepositoryId, {
+				openIfNeeded: true,
+				skipRefValidation: true,
+			}),
 		]);
 
 		const contents = getSettledValue(contentsResult)!;

diff --git a/src/plus/repos/repositoryIdentityService.ts b/src/plus/repos/repositoryIdentityService.ts
@@ -25,46 +25,46 @@ export class RepositoryIdentityService implements Disposable {
 
 	getRepository(
 		id: GkRepositoryId,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined>;
 	getRepository(
 		identity: RepositoryIdentity,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined>;
 
 	@log()
 	getRepository(
 		idOrIdentity: GkRepositoryId | RepositoryIdentity,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined> {
 		return this.locateRepository(idOrIdentity, options);
 	}
 
 	@log()
 	async getRepositoryOrIdentity(
 		id: GkRepositoryId,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | RepositoryIdentity> {
 		const identity = await this.getRepositoryIdentity(id);
 		return (await this.locateRepository(identity, options)) ?? identity;
 	}
 
 	private async locateRepository(
 		id: GkRepositoryId,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined>;
 	private async locateRepository(
 		identity: RepositoryIdentity,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined>;
 	private async locateRepository(
 		idOrIdentity: GkRepositoryId | RepositoryIdentity,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined>;
 	@log()
 	private async locateRepository(
 		idOrIdentity: GkRepositoryId | RepositoryIdentity,
-		options?: { openIfNeeded?: boolean; prompt?: boolean },
+		options?: { openIfNeeded?: boolean; prompt?: boolean; skipRefValidation?: boolean },
 	): Promise<Repository | undefined> {
 		const identity =
 			typeof idOrIdentity === 'string' ? await this.getRepositoryIdentity(idOrIdentity) : idOrIdentity;
@@ -111,7 +111,11 @@ export class RepositoryIdentityService implements Disposable {
 					}
 				}
 
-				if (identity.initialCommitSha != null && identity.initialCommitSha !== missingRepositoryId) {
+				if (
+					!options?.skipRefValidation &&
+					identity.initialCommitSha != null &&
+					identity.initialCommitSha !== missingRepositoryId
+				) {
 					// Repo ID can be any valid SHA in the repo, though standard practice is to use the
 					// first commit SHA.
 					if (await this.container.git.validateReference(repo.uri, identity.initialCommitSha)) {