Browse Source

Change the implementation of the go-git version of GetNote to mirror the non go-git version when passed a non-existent commit (#16658)

Fixes #16657
tags/v1.16.0-rc1
nitul1991 2 years ago
parent
commit
23d438f565
No account linked to committer's email address
2 changed files with 15 additions and 0 deletions
  1. 3
    0
      modules/git/notes_gogit.go
  2. 12
    0
      modules/git/notes_test.go

+ 3
- 0
modules/git/notes_gogit.go View File

@@ -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
}
}

+ 12
- 0
modules/git/notes_test.go View File

@@ -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)
}

Loading…
Cancel
Save