Do not always overwrite the GITHUB_REF for PRs #217
Merged
Conversation
This file contains hidden or 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
As we move towards analysing the merge commit for pull requests by default, we should stop sending `/refs/pull/n/head` rather than `refs/pull/n/merge` _unless_ the checked-out SHA has actually changed. Here we assume that any change (compared to GITHUB_SHA) indicates that `git checkout HEAD^2` has been run earlier. This may sometimes be incorrect (e.g. `git checkout mybranch`), but in that case the ref would be wrong either way.
rneatherway
force-pushed
the
rneatherway/optional-merge
branch
from
74587c5 to
7795860
Compare
chrisgavin
approved these changes
Sep 29, 2020
Contributor
chrisgavin
left a comment
chrisgavin
left a comment
There was a problem hiding this comment.
I've tested this with the backend changes required to map merge commit annotations to the head commit and it worked great!
Contributor
Author
|
Thanks! |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As we move towards analysing the merge commit for pull requests by
default, we should stop sending
/refs/pull/n/headrather thanrefs/pull/n/mergeunless the checked-out SHA has actually changed.Here we assume that any change (compared to GITHUB_SHA) indicates that
git checkout HEAD^2has been run earlier. This may sometimes beincorrect (e.g.
git checkout mybranch), but in that case the refwould be wrong either way.
Merge / deployment checklist