diff --git a/TGS.Server/Instance/Repository.cs b/TGS.Server/Instance/Repository.cs index 76cb247190..f081c815dc 100644 --- a/TGS.Server/Instance/Repository.cs +++ b/TGS.Server/Instance/Repository.cs @@ -420,8 +420,8 @@ namespace TGS.Server } return GetShaOrBranchNoLock(out error, branch, tracked); } - } - + } + /// /// Gets the SHA or branch name of the 's HEAD. Requires /// @@ -429,27 +429,27 @@ namespace TGS.Server /// If , returns the branch name instead of the SHA /// If , returns the tracked branch SHA and ignores /// The SHA or branch name of the 's HEAD - string GetShaOrBranchNoLock(out string error, bool branch, bool tracked) - { - var result = LoadRepo(); - if (result != null) - { - error = result; - return null; - } - - try - { - error = null; - if (tracked && Repo.Head.TrackedBranch != null) - return Repo.Head.TrackedBranch.Tip.Sha; - return branch ? Repo.Head.FriendlyName : Repo.Head.Tip.Sha; - } - catch (Exception e) - { - error = e.ToString(); - return null; - } + string GetShaOrBranchNoLock(out string error, bool branch, bool tracked) + { + var result = LoadRepo(); + if (result != null) + { + error = result; + return null; + } + + try + { + error = null; + if (tracked && Repo.Head.TrackedBranch != null) + return Repo.Head.TrackedBranch.Tip.Sha; + return branch ? Repo.Head.FriendlyName : Repo.Head.Tip.Sha; + } + catch (Exception e) + { + error = e.ToString(); + return null; + } } /// @@ -953,7 +953,7 @@ namespace TGS.Server } //so we'll know if this fails - var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Environment.NewLine, Config.Name)); + var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("[ci skip] Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Environment.NewLine, Config.Name)); if (Result == null) try