From 9ad6d40a27323f5af74f1bfcf8da74cc860c3d00 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Wed, 19 Sep 2018 14:09:55 -0400
Subject: [PATCH] Clean up NonFastForwardException exceptions

---
 src/Tgstation.Server.Host/Components/Repository/Repository.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Tgstation.Server.Host/Components/Repository/Repository.cs b/src/Tgstation.Server.Host/Components/Repository/Repository.cs
index 7eb8890da0..10f7b12e84 100644
--- a/src/Tgstation.Server.Host/Components/Repository/Repository.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/Repository.cs
@@ -550,6 +550,10 @@ namespace Tgstation.Server.Host.Components.Repository
 				{
 					repository.Network.Push(repository.Head, GeneratePushOptions(progressReporter, username, password, cancellationToken));
 				}
+				catch (NonFastForwardException)
+				{
+					logger.LogInformation("Synchronize aborted, non-fast forward!");
+				}
 				catch (UserCancelledException)
 				{
 					cancellationToken.ThrowIfCancellationRequested();