From 729f46a821e68366ec58ae5d7b70c67a738bebc9 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 3 Oct 2018 00:47:04 -0400 Subject: [PATCH 1/3] Fix IsSha --- .../Components/Repository/Repository.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Repository/Repository.cs b/src/Tgstation.Server.Host/Components/Repository/Repository.cs index bac6bdafa5..6608fcd753 100644 --- a/src/Tgstation.Server.Host/Components/Repository/Repository.cs +++ b/src/Tgstation.Server.Host/Components/Repository/Repository.cs @@ -587,8 +587,19 @@ namespace Tgstation.Server.Host.Components.Repository /// public Task IsSha(string committish, CancellationToken cancellationToken) => Task.Factory.StartNew(() => { - var gitObject = repository.Lookup(committish, ObjectType.Commit); - return gitObject != null; + //check if it's a tag + var gitObject = repository.Lookup(committish, ObjectType.Tag); + if (gitObject != null) + return false; + cancellationToken.ThrowIfCancellationRequested(); + //check if it's a branch + if (repository.Branches[committish] != null) + return false; + cancellationToken.ThrowIfCancellationRequested(); + //err on the side of references, if we can't look it up, assume its a reference + if (repository.Lookup(committish) != null) + return true; + return false; }, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current); } } From 9c86b648fab5f306da951a11184315c09247cd3b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 3 Oct 2018 00:47:48 -0400 Subject: [PATCH 2/3] Fix ByondExecutableLock --- .../Components/Byond/ByondExecutableLock.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Byond/ByondExecutableLock.cs b/src/Tgstation.Server.Host/Components/Byond/ByondExecutableLock.cs index 3e33e03e0c..a1a3535225 100644 --- a/src/Tgstation.Server.Host/Components/Byond/ByondExecutableLock.cs +++ b/src/Tgstation.Server.Host/Components/Byond/ByondExecutableLock.cs @@ -23,8 +23,8 @@ namespace Tgstation.Server.Host.Components.Byond public ByondExecutableLock(Version version, string dreamDaemonPath, string dreamMakerPath) { Version = version ?? throw new ArgumentNullException(nameof(version)); - dreamDaemonPath = dreamDaemonPath ?? throw new ArgumentNullException(nameof(dreamDaemonPath)); - dreamMakerPath = dreamMakerPath ?? throw new ArgumentNullException(nameof(dreamMakerPath)); + DreamDaemonPath = dreamDaemonPath ?? throw new ArgumentNullException(nameof(dreamDaemonPath)); + DreamMakerPath = dreamMakerPath ?? throw new ArgumentNullException(nameof(dreamMakerPath)); } //at one point in design, byond versions were to delete themselves if they werent the active version From 40a406e478cbe01a229d969229fd37b50831fa1a Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 3 Oct 2018 00:55:35 -0400 Subject: [PATCH 3/3] Version bump to 4.0.0.6 --- .../Tgstation.Server.Host.Console.csproj | 2 +- src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs | 4 ++-- .../Tgstation.Server.Host.Watchdog.csproj | 2 +- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index 39751be2d8..9ebf9f9273 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -4,7 +4,7 @@ Exe netcoreapp2.1 Full - 4.0.0.5 + 4.0.0.6 diff --git a/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs b/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs index d336b8f403..2b50e94b5c 100644 --- a/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs +++ b/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs @@ -7,5 +7,5 @@ using System.Runtime.InteropServices; [assembly: Guid("29927416-3b78-49a7-a560-5ccaa638b6b4")] [assembly: InternalsVisibleTo("Tgstation.Server.Host.Service.Tests")] -[assembly: AssemblyVersion("4.0.0.5")] -[assembly: AssemblyFileVersion("4.0.0.5")] +[assembly: AssemblyVersion("4.0.0.6")] +[assembly: AssemblyFileVersion("4.0.0.6")] diff --git a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj index bc54f79353..0cd1b147ed 100644 --- a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj +++ b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj @@ -4,7 +4,7 @@ netstandard2.0 Full false - 4.0.0.5 + 4.0.0.6 diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9d33cd974a..9a058b87d8 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -3,7 +3,7 @@ netcoreapp2.1 Full - 4.0.0.5 + 4.0.0.6