Merge pull request #1991 from tgstation/RepoRecloneFix

Do not attempt to checkout a detached SHA on reclone
tgstation · Nov 10, 2024 · c500ec4 · c500ec4
2 parents 2aa16e8 + 08f0caf
commit c500ec4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs b/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs
@@ -642,11 +642,10 @@ public async ValueTask RepositoryRecloneJob(
 				await deleteTask;
 			}
 
-			IRepository newRepo;
 			try
 			{
-				using var cloneReporter = progressReporter.CreateSection("Cloning New Repository", 0.8);
-				newRepo = await instance.RepositoryManager.CloneRepository(
+				using var cloneReporter = progressReporter.CreateSection("Cloning New Repository", 0.9);
+				using var newRepo = await instance.RepositoryManager.CloneRepository(
 					origin,
 					oldReference,
 					currentModel.AccessUser,
@@ -671,19 +670,6 @@ await databaseContextFactory.UseContextTaskReturn(context =>
 
 				throw;
 			}
-
-			using (newRepo)
-			using (var checkoutReporter = progressReporter.CreateSection("Checking out previous Detached Commit", 0.1))
-			{
-				await newRepo.CheckoutObject(
-					oldSha,
-					currentModel.AccessUser,
-					currentModel.AccessToken,
-					false,
-					oldReference != null,
-					checkoutReporter,
-					cancellationToken);
-			}
 		}
 	}
 }
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/RepositoryTest.cs
@@ -116,8 +116,6 @@ public async Task AbortLongCloneAndCloneSomethingQuick(Task<JobResponse> longClo
 			await ApiAssert.ThrowsException<ApiConflictException, RepositoryResponse>(() => Checkout(new RepositoryUpdateRequest { Reference = "master", CheckoutSha = "286bb75" }, false, false, cancellationToken), ErrorCode.RepoMismatchShaAndReference);
 			var updated = await Checkout(new RepositoryUpdateRequest { CheckoutSha = "286bb75" }, false, false, cancellationToken);
 
-			await RecloneTest(cancellationToken);
-
 			// Fake SHA
 			updated = await Checkout(new RepositoryUpdateRequest { CheckoutSha = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" }, true, false, cancellationToken);
 
@@ -127,6 +125,8 @@ public async Task AbortLongCloneAndCloneSomethingQuick(Task<JobResponse> longClo
 			// Back
 			updated = await Checkout(new RepositoryUpdateRequest { Reference = "master" }, false, true, cancellationToken);
 
+			await RecloneTest(cancellationToken);
+
 			// enable the good shit if possible
 			if (!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TGS_TEST_GITHUB_TOKEN"))
 				&& !(Boolean.TryParse(Environment.GetEnvironmentVariable("TGS_TEST_OD_EXCLUSIVE"), out var odExclusive) && odExclusive))