diff --git a/src/Tgstation.Server.Host/Components/Interop/TestMerge.cs b/src/Tgstation.Server.Host/Components/Interop/TestMerge.cs
index 71c21a55bc..9e8b795b53 100644
--- a/src/Tgstation.Server.Host/Components/Interop/TestMerge.cs
+++ b/src/Tgstation.Server.Host/Components/Interop/TestMerge.cs
@@ -1,4 +1,5 @@
-using System.Globalization;
+using System;
+using System.Globalization;
using Tgstation.Server.Api.Models.Internal;
namespace Tgstation.Server.Host.Components.Interop
@@ -22,14 +23,11 @@ namespace Tgstation.Server.Host.Components.Interop
/// Construct a
///
/// The to build from
- public TestMerge(Models.TestMerge testMerge) : base(testMerge)
+ /// The value of
+ public TestMerge(Models.TestMerge testMerge, RevisionInformation revision) : base(testMerge)
{
TimeMerged = testMerge.MergedAt.Ticks.ToString(CultureInfo.InvariantCulture);
- Revision = new RevisionInformation
- {
- CommitSha = testMerge.PrimaryRevisionInformation.CommitSha,
- OriginCommitSha = testMerge.PrimaryRevisionInformation.OriginCommitSha
- };
+ Revision = revision ?? throw new ArgumentNullException(nameof(revision));
}
}
}
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
index 363a068bac..d1de6c468a 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
@@ -147,7 +147,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
};
- interopInfo.TestMerges.AddRange(dmbProvider.CompileJob.RevisionInformation.ActiveTestMerges.Select(x => x.TestMerge).Select(x => new Interop.TestMerge(x)));
+ interopInfo.TestMerges.AddRange(dmbProvider.CompileJob.RevisionInformation.ActiveTestMerges.Select(x => x.TestMerge).Select(x => new Interop.TestMerge(x, interopInfo.Revision)));
var interopJsonFile = JsonFile("interop");