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

Don't ignore error in getMergeCommit #1843

Merged
merged 1 commit into from
Jun 1, 2017

Conversation

ethantkoenig
Copy link
Member

Check for previously-ignored error in PullRequest.getMergeCommit(), and return appropriate errors in unexpected circumstances.

Should help in debugging #1186 (note: this PR does NOT fix the problem, but only helps to diagnose it)

@lunny
Copy link
Member

lunny commented Jun 1, 2017

LGTM

@tboerger tboerger added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 1, 2017
@appleboy
Copy link
Member

appleboy commented Jun 1, 2017

LGTM

@tboerger tboerger 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 Jun 1, 2017
@appleboy appleboy merged commit a977ab7 into go-gitea:master Jun 1, 2017
@ethantkoenig ethantkoenig deleted the fix/pull_error branch June 1, 2017 03:44
ethantkoenig added a commit to ethantkoenig/gitea that referenced this pull request Jul 11, 2017
@sapk sapk mentioned this pull request Jul 11, 2017
appleboy pushed a commit that referenced this pull request Jul 11, 2017
* Fix fast-forward PR bug

* Don't ignore error in getMergeCommit (#1843)
@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.

4 participants