TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 16:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on view commit with notes (#15561) (#15573)

Browse Source 
Backport #15561

Fix #15558

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath
2021-04-21 20:11:43 +01:00
committed by GitHub
parent 990c6089db
commit 248b67af6f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/git/notes_nogogit.go
View File

@@ -8,6 +8,7 @@ package git
import ( import (
"io/ioutil" "io/ioutil"
"strings"
) )
// GetNote retrieves the git-notes data for a given commit. // 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 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 { if err != nil {
return err return err
} }