opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-05-22 17:48:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle and return empty string for dangling commits in GetBranchName (#11587)

Browse Source
This commit is contained in:
Cirno the Strongest
2020-05-23 21:49:48 +02:00
committed by GitHub
parent 723b199271
commit 31df012968
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/git/commit.go
View File

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