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

Merge pull request #625 from Cyberboss/FixEmptyCommit

Browse Source 
Fix EmptyCommitExceptions while test merging
This commit is contained in:
Jordan Brown
2018-09-12 10:07:31 -04:00
committed by GitHub
parent b1f6719da4 6254913d46
commit 83dba4cab0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Repository/Repository.cs
+1 -1
View File
@@ -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