Browse Source

Don't consider tag refs as valid for branch name (#11847)

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
tags/v1.13.0-rc1
Cirno the Strongest GitHub 5 years ago
parent
commit
69c1bccf61
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      modules/git/commit.go

+ 1
- 1
modules/git/commit.go View File

@@ -468,7 +468,7 @@ func (c *Commit) GetSubModule(entryname string) (*SubModule, error) {


// GetBranchName gets the closes branch name (as returned by 'git name-rev --name-only') // GetBranchName gets the closes branch name (as returned by 'git name-rev --name-only')
func (c *Commit) GetBranchName() (string, error) { func (c *Commit) GetBranchName() (string, error) {
data, err := NewCommand("name-rev", "--name-only", "--no-undefined", c.ID.String()).RunInDir(c.repo.Path)
data, err := NewCommand("name-rev", "--exclude", "refs/tags/*", "--name-only", "--no-undefined", c.ID.String()).RunInDir(c.repo.Path)
if err != nil { if err != nil {
// handle special case where git can not describe commit // handle special case where git can not describe commit
if strings.Contains(err.Error(), "cannot describe") { if strings.Contains(err.Error(), "cannot describe") {


Loading…
Cancel
Save