cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1333 from tgstation/FixANullRef

Browse Source 
Fix a null reference exception when test merging
This commit is contained in:
Jordan Brown
2021-09-25 10:37:11 -04:00
committed by GitHub
parent 8b11d8873c 530e64ac73
commit 6ad409f9ae
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Repository/Repository.cs
+6 -1
View File
@@ -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();