From 530e64ac73a0aded608afd426d2bd1d26b4fe161 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 24 Sep 2021 14:12:00 -0400 Subject: [PATCH] Fix a null reference exception when test merging - Could happen when specifying a bad TargetCommitSha --- .../Components/Repository/Repository.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Repository/Repository.cs b/src/Tgstation.Server.Host/Components/Repository/Repository.cs index a8a1903301..205044ba6f 100644 --- a/src/Tgstation.Server.Host/Components/Repository/Repository.cs +++ b/src/Tgstation.Server.Host/Components/Repository/Repository.cs @@ -287,7 +287,12 @@ namespace Tgstation.Server.Host.Components.Repository cancellationToken.ThrowIfCancellationRequested(); - testMergeParameters.TargetCommitSha = libGitRepo.Lookup(testMergeParameters.TargetCommitSha ?? localBranchName).Sha; + var objectName = testMergeParameters.TargetCommitSha ?? localBranchName; + var gitObject = libGitRepo.Lookup(objectName); + if (gitObject == null) + throw new JobException($"Could not find object to merge: {objectName}"); + + testMergeParameters.TargetCommitSha = gitObject.Sha; cancellationToken.ThrowIfCancellationRequested();