Skip to content

Commit

Permalink
Change the implementation of the go-git version of GetNote to mirror …
Browse files Browse the repository at this point in the history
…the non go-git version when passed a non-existent commit (#16658) (#16659)

Backport #16658

Fixes #16657
  • Loading branch information
nitul1991 committed Aug 9, 2021
1 parent 46d62ad commit e483ec8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
3 changes: 3 additions & 0 deletions modules/git/notes_gogit.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
remainingCommitID = remainingCommitID[2:]
}
if err != nil {
if err == object.ErrDirectoryNotFound {
return ErrNotExist{ID: remainingCommitID, RelPath: path}
}
return err
}
}
Expand Down
12 changes: 12 additions & 0 deletions modules/git/notes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,15 @@ func TestGetNestedNotes(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, []byte("Note 1"), note.Message)
}

func TestGetNonExistentNotes(t *testing.T) {
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
bareRepo1, err := OpenRepository(bareRepo1Path)
assert.NoError(t, err)
defer bareRepo1.Close()

note := Note{}
err = GetNote(context.Background(), bareRepo1, "non_existent_sha", &note)
assert.Error(t, err)
assert.IsType(t, ErrNotExist{}, err)
}

0 comments on commit e483ec8

Please sign in to comment.