Skip to content

Important: wrong PR merge commit ID saved #2007

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 1 commit into from
Jun 19, 2017

Conversation

lafriks
Copy link
Member

@lafriks lafriks commented Jun 18, 2017

When merging PR changes that were made from forked repository last commit ID is taken from fork not base repository but for target branch, so it will point to wrong commit ID

@lunny lunny added this to the 1.2.0 milestone Jun 19, 2017
@lunny lunny added the type/bug label Jun 19, 2017
@lunny
Copy link
Member

lunny commented Jun 19, 2017

Any integration test?

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 19, 2017
@lunny
Copy link
Member

lunny commented Jun 19, 2017

LGTM

@tboerger tboerger 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 Jun 19, 2017
@bkcsoft
Copy link
Member

bkcsoft commented Jun 19, 2017

@lunny Since this is a model it would make more sense to have a UnitTest... Integration tests are mainly for End-To-End (web routes...)

@bkcsoft
Copy link
Member

bkcsoft commented Jun 19, 2017

but 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 19, 2017
@lafriks
Copy link
Member Author

lafriks commented Jun 19, 2017

integration test for #1994 will cover this

@lunny lunny merged commit 165cf33 into go-gitea:master Jun 19, 2017
@lafriks lafriks deleted the patch-2 branch June 21, 2017 06:09
@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