From 63713386dac1ceba83357868dd2a6fc6d6983ca5 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Wed, 5 Aug 2020 00:20:16 -0400
Subject: [PATCH] If all test merges are merged on auto-update, hard reset to
 origin

---
 .../Components/Instance.cs                    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index fbe5466555..2195868f00 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -304,17 +304,27 @@ namespace Tgstation.Server.Host.Components
 											cancellationToken)
 										.ConfigureAwait(false);
 
-										var lastRevInfoWasOriginCommit = currentRevInfo == default || currentRevInfo.CommitSha == currentRevInfo.OriginCommitSha;
-										var stillOnOrigin = result.Value && lastRevInfoWasOriginCommit;
-
-										var currentHead = repo.Head;
-										if (currentHead != startSha)
+										if (updatedTestMerges.Count == 0)
 										{
-											await UpdateRevInfo(currentHead, stillOnOrigin, updatedTestMerges).ConfigureAwait(false);
-											shouldSyncTracked = stillOnOrigin;
+											logger.LogTrace("All test merges have been merged on remote");
+											preserveTestMerges = false;
 										}
 										else
-											shouldSyncTracked = false;
+										{
+											var lastRevInfoWasOriginCommit =
+												currentRevInfo == default
+												|| currentRevInfo.CommitSha == currentRevInfo.OriginCommitSha;
+											var stillOnOrigin = result.Value && lastRevInfoWasOriginCommit;
+
+											var currentHead = repo.Head;
+											if (currentHead != startSha)
+											{
+												await UpdateRevInfo(currentHead, stillOnOrigin, updatedTestMerges).ConfigureAwait(false);
+												shouldSyncTracked = stillOnOrigin;
+											}
+											else
+												shouldSyncTracked = false;
+										}
 									}
 
 									if (!preserveTestMerges)