cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 07:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server
2021-09-25 14:38:02 +00:00
parent cbe7d04683 6ad409f9ae
commit 119c1201cc
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
@@ -293,7 +293,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();