From bde87633673baf7c0956e27d9a6f7bfe40b1d575 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 11 Nov 2017 23:58:09 -0500 Subject: [PATCH] Fixes MergePullRequest recording the wrong SHA --- TGServerService/ServerInstance/Repository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TGServerService/ServerInstance/Repository.cs b/TGServerService/ServerInstance/Repository.cs index f66d4e8e6a..e590280059 100644 --- a/TGServerService/ServerInstance/Repository.cs +++ b/TGServerService/ServerInstance/Repository.cs @@ -965,7 +965,7 @@ namespace TGServerService var dick = Deserializer.DeserializeObject(json) as IDictionary; var user = dick["user"] as IDictionary; - newPR.Add("commit", branch.Tip.Sha); + newPR.Add("commit", atSHA ?? branch.Tip.Sha); newPR.Add("author", (string)user["login"]); newPR.Add("title", (string)dick["title"]); CurrentPRs.Add(PRNumberString, newPR);