From e6795dd84cd11d23642afae11058488666097e4f Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Wed, 12 Sep 2018 13:35:07 -0400 Subject: [PATCH] Prevent the same test merge PR# from being merged multiple times in one commit chain. This is necessary to keep a sane database. Workaround is to checkout whatever base you want and then reapply test merges as desired --- src/Tgstation.Server.Host/Controllers/RepositoryController.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 29bea54022..a5e749c6d4 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -609,6 +609,10 @@ namespace Tgstation.Server.Host.Controllers { Octokit.PullRequest pr = null; string errorMessage = null; + + if (lastRevisionInfo.ActiveTestMerges.Any(x => x.TestMerge.Number == I.Number.Value)) + throw new JobException("Cannot test merge the same PR twice in one HEAD!"); + try { //load from cache if possible