Skip to content

Fix NPE on view commit with notes #15561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeripath merged 2 commits into from
Apr 21, 2021
Merged

Fix NPE on view commit with notes #15561

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88f39bf
Fix NPE on view commit with notes
zeripath Apr 20, 2021
9ed7183
Merge branch 'master' into fix-15558-notes-path
6543 Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion modules/git/notes_nogogit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package git

import (
"io/ioutil"
"strings"
)

// GetNote retrieves the git-notes data for a given commit.
Expand Down Expand Up @@ -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
}
Expand Down