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

If all test merges are merged on auto-update, hard reset to origin

Browse Source
This commit is contained in:
Jordan Brown
2020-08-05 00:20:16 -04:00
parent b7e86cf00c
commit 63713386da
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Instance.cs
+18 -8
View File
@@ -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)