Fix fast-forward PR bug #1989
Merged
Fix fast-forward PR bug #1989
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good. Do we have PR integration test? |
tboerger
added
the
lgtm/need 2
|
@lafriks but the CI is not failed before this PR. So I think that test didn't hit the situation this PR wants to resolve. But anyhow LGTM. |
tboerger
added
lgtm/need 1
|
@lunny This is difficult to write an integration test for, because the error occurred in a background thread. The error wouldn't cause a test to fail, since the test has no way of checking whether the error occurred. |
|
Will this be backported to 1.1.x? |
|
@ashkulz sure. |
|
LGTM |
tboerger
added
lgtm/done
7 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1186 and #1964.
If a PR is fast-forwarded, use the last commit of the PR as the "merge commit".
This ignores a more subtle problem, which is that we determine the "merger" of a PR by the author of the "merge commit", not by the user who actually pushed that commit to origin (which is how Github does it). Fixing this would require a much larger refactor, so for now I decided to just do a quick fix for the more glaring problem.