From 7f85728cf9c6ab1dcec5ed1be1dc66cef24634c3 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 14 Dec 2020 20:35:40 +0000 Subject: [PATCH] Trim the branch prefix from action.GetBranch (#13981) (#13986) Backport #13981 #13882 has revealed that the refname of an action is actually only a refname pattern and necessarily a branch. For examplem pushing to refs/heads/master will result in action with refname refs/heads/master but pushing to master will result in a refname master. The simplest solution to providing a fix here is to trim the prefix therefore this PR proposes this. Signed-off-by: Andrew Thornton Co-authored-by: a1012112796 <1012112796@qq.com> Co-authored-by: a1012112796 <1012112796@qq.com> --- models/action.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/action.go b/models/action.go index f4d163afa3..2b244fe90e 100644 --- a/models/action.go +++ b/models/action.go @@ -13,6 +13,7 @@ import ( "time" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -243,7 +244,7 @@ func (a *Action) getCommentLink(e Engine) string { // GetBranch returns the action's repository branch. func (a *Action) GetBranch() string { - return a.RefName + return strings.TrimPrefix(a.RefName, git.BranchPrefix) } // GetContent returns the action's content.