Skip to content
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

Fix PR nil-dereference bug #2195

Merged
merged 2 commits into from Jul 26, 2017
Merged

Conversation

ethantkoenig
Copy link
Member

Fixes #2190. Also adds unit tests for previously-broken methods.

@lafriks lafriks added this to the 1.2.0 milestone Jul 22, 2017
@lafriks lafriks added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 22, 2017
@andreynering
Copy link
Contributor

Trusted LGTM

@lafriks lafriks added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 23, 2017
models/issue.go Outdated
if IsErrPullRequestNotExist(err) {
return err
}
return fmt.Errorf("getPullRequestByIssueID: %v", err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why reformat error here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Causality of moving code around, I'll change it back to what it previously was (fmt.Errorf("getPullRequestByIssueID [%d]: %v", issue.ID, err))

if IsErrPullRequestNotExist(err) {
return err
}
return fmt.Errorf("getPullRequestByIssueID [%d]: %v", issue.ID, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But still I think it should be loadPullRequest in error message

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can change it if you really want, but this is more consistent with the other loadXYZ(..) methods.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry it is correct you are right

@lafriks
Copy link
Member

lafriks commented Jul 24, 2017

LGTM

@lafriks lafriks added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 24, 2017
@lunny
Copy link
Member

lunny commented Jul 26, 2017

please force empty push

@lunny lunny merged commit 48898e5 into go-gitea:master Jul 26, 2017
@ethantkoenig ethantkoenig deleted the fix/issue2190 branch July 26, 2017 15:02
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

labels: [macaron] invalid memory address or nil pointer dereference
4 participants