Skip to content

Fix NPE on try to get tag reference via API #18245

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.

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
merged 4 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions modules/git/repo_commit_nogogit.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ func (repo *Repository) getCommitFromBatchReader(rd *bufio.Reader, id SHA1) (*Co
if err != nil {
return nil, err
}
tag.repo = repo

commit, err := tag.Commit()
commit, err := tag.Commit(repo)
if err != nil {
return nil, err
}
Expand Down
2 changes: 0 additions & 2 deletions modules/git/repo_tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ func (repo *Repository) getTag(tagID SHA1, name string) (*Tag, error) {
Type: tp,
Tagger: commit.Committer,
Message: commit.Message(),
repo: repo,
}

repo.tagCache.Set(tagID.String(), tag)
Expand All @@ -92,7 +91,6 @@ func (repo *Repository) getTag(tagID SHA1, name string) (*Tag, error) {

tag.Name = name
tag.ID = tagID
tag.repo = repo
tag.Type = tp

repo.tagCache.Set(tagID.String(), tag)
Expand Down
1 change: 0 additions & 1 deletion modules/git/repo_tag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ func TestRepository_GetTag(t *testing.T) {
if lTag == nil {
assert.FailNow(t, "nil lTag: %s", lTagName)
}
lTag.repo = nil
assert.EqualValues(t, lTagName, lTag.Name)
assert.EqualValues(t, lTagCommitID, lTag.ID.String())
assert.EqualValues(t, lTagCommitID, lTag.Object.String())
Expand Down
2 changes: 1 addition & 1 deletion modules/git/repo_tree_nogogit.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (repo *Repository) getTree(id SHA1) (*Tree, error) {
if err != nil {
return nil, err
}
commit, err := tag.Commit()
commit, err := tag.Commit(repo)
if err != nil {
return nil, err
}
Expand Down
5 changes: 2 additions & 3 deletions modules/git/tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const endpgp = "\n-----END PGP SIGNATURE-----"
type Tag struct {
Name string
ID SHA1
repo *Repository
Object SHA1 // The id of this commit object
Type string
Tagger *Signature
Expand All @@ -26,8 +25,8 @@ type Tag struct {
}

// Commit return the commit of the tag reference
func (tag *Tag) Commit() (*Commit, error) {
return tag.repo.getCommit(tag.Object)
func (tag *Tag) Commit(gitRepo *Repository) (*Commit, error) {
return gitRepo.getCommit(tag.Object)
}

// Parse commit information from the (uncompressed) raw
Expand Down
2 changes: 0 additions & 2 deletions modules/git/tag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ tagger Lucas Michot <[email protected]> 1484491741 +0100
`), tag: Tag{
Name: "",
ID: SHA1{},
repo: nil,
Object: SHA1{0x3b, 0x11, 0x4a, 0xb8, 0x0, 0xc6, 0x43, 0x2a, 0xd4, 0x23, 0x87, 0xcc, 0xf6, 0xbc, 0x8d, 0x43, 0x88, 0xa2, 0x88, 0x5a},
Type: "commit",
Tagger: &Signature{Name: "Lucas Michot", Email: "[email protected]", When: time.Unix(1484491741, 0)},
Expand All @@ -42,7 +41,6 @@ o
ono`), tag: Tag{
Name: "",
ID: SHA1{},
repo: nil,
Object: SHA1{0x7c, 0xdf, 0x42, 0xc0, 0xb1, 0xcc, 0x76, 0x3a, 0xb7, 0xe4, 0xc3, 0x3c, 0x47, 0xa2, 0x4e, 0x27, 0xc6, 0x6b, 0xfc, 0xcc},
Type: "commit",
Tagger: &Signature{Name: "Lucas Michot", Email: "[email protected]", When: time.Unix(1484553735, 0)},
Expand Down
2 changes: 1 addition & 1 deletion modules/repository/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ func PushUpdateAddTag(repo *repo_model.Repository, gitRepo *git.Repository, tagN
if err != nil {
return fmt.Errorf("GetTag: %v", err)
}
commit, err := tag.Commit()
commit, err := tag.Commit(gitRepo)
if err != nil {
return fmt.Errorf("Commit: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/repo/tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func GetAnnotatedTag(ctx *context.APIContext) {
if tag, err := ctx.Repo.GitRepo.GetAnnotatedTag(sha); err != nil {
ctx.Error(http.StatusBadRequest, "GetAnnotatedTag", err)
} else {
commit, err := tag.Commit()
commit, err := tag.Commit(ctx.Repo.GitRepo)
if err != nil {
ctx.Error(http.StatusBadRequest, "GetAnnotatedTag", err)
}
Expand Down
2 changes: 1 addition & 1 deletion services/repository/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo
if err != nil {
return fmt.Errorf("GetTag: %v", err)
}
commit, err := tag.Commit()
commit, err := tag.Commit(gitRepo)
if err != nil {
return fmt.Errorf("Commit: %v", err)
}
Expand Down