Browse Source

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

Backport #15561

Fix #15558

Signed-off-by: Andrew Thornton <art27@cantab.net>
mj-v1.14.3
zeripath 1 year ago
committed by GitHub
parent
commit
248b67af6f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      modules/git/notes_nogogit.go

9
modules/git/notes_nogogit.go

@ -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…
Cancel
Save