Fix NPE on view commit with notes (#15561)
Fix #15558 Signed-off-by: Andrew Thornton <art27@cantab.net>release/v1.15
parent
2255afffad
commit
1cd8d0ca0e
|
@ -8,6 +8,7 @@ package git
|
|||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// GetNote retrieves the git-notes data for a given commit.
|
||||
|
@ -49,7 +50,13 @@ func GetNote(repo *Repository, commitID string, note *Note) error {
|
|||
}
|
||||
note.Message = d
|
||||
|
||||
lastCommits, err := GetLastCommitForPaths(notes, "", []string{path})
|
||||
treePath := ""
|
||||
if idx := strings.LastIndex(path, "/"); idx > -1 {
|
||||
treePath = path[:idx]
|
||||
path = path[idx+1:]
|
||||
}
|
||||
|
||||
lastCommits, err := GetLastCommitForPaths(notes, treePath, []string{path})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue