diff options
| author | zeripath <art27@cantab.net> | 2020-12-14 17:08:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 19:08:37 +0200 |
| commit | c3fc190372cb525fdacf60606bf8aaf1c33e7da7 (patch) | |
| tree | add7dd5e8f9ca995e4f8758fa4af9db63e0325d5 | |
| parent | 729f0f5f7ba98e9472d69f30a6c9433039f5e0a0 (diff) | |
| download | gitea-c3fc190372cb525fdacf60606bf8aaf1c33e7da7.tar.gz gitea-c3fc190372cb525fdacf60606bf8aaf1c33e7da7.zip | |
Trim the branch prefix from action.GetBranch (#13981)
* Trim the branch prefix from action.GetBranch
#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 <art27@cantab.net>
* Update models/action.go
Co-authored-by: a1012112796 <1012112796@qq.com>
Co-authored-by: a1012112796 <1012112796@qq.com>
| -rw-r--r-- | models/action.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/models/action.go b/models/action.go index 67c60d84f3..e702a4263c 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" @@ -238,7 +239,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. |