From 6254913d4686a6570d928374c9a614efb6baf13f Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Tue, 11 Sep 2018 16:20:59 -0400
Subject: [PATCH] Fix EmptyCommitExceptions

---
 src/Tgstation.Server.Host/Components/Repository/Repository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/Components/Repository/Repository.cs b/src/Tgstation.Server.Host/Components/Repository/Repository.cs
index 0ed716b751..1b704da4f5 100644
--- a/src/Tgstation.Server.Host/Components/Repository/Repository.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/Repository.cs
@@ -212,7 +212,7 @@ namespace Tgstation.Server.Host.Components.Repository
 				return false;
 			}
 
-			if (commitMessage != null)
+			if (commitMessage != null && result.Status != MergeStatus.UpToDate)
 				repository.Commit(commitMessage, sig, sig, new CommitOptions
 				{
 					PrettifyMessage = true