Uh oh!
There was an error while loading. Please reload this page.
Fix missing related PRs when cherry-picking - #33261
Merged
ephraimbuddy merged 1 commit intoAug 9, 2023
Merged
Conversation
The `airflow-github` tooling had a check if PR has been already merged, but the PR did not work well when there was already a PR cherry-picked that referred the PR in question in their log message. The check was done via `git log --grep=#PR` essentially and so it happenes that `--grep` matches not only the first line of the message but the whole log message. So if the log message contained reference to the cherry-picked PR it was seen as merged. This change adds ( ) around and $ to the regexp to match not only the PR number but also parentheses around.
ephraimbuddy
approved these changes
Aug 9, 2023
ephraimbuddy pushed a commit
that referenced
this pull request
Aug 9, 2023
The `airflow-github` tooling had a check if PR has been already merged, but the PR did not work well when there was already a PR cherry-picked that referred the PR in question in their log message. The check was done via `git log --grep=#PR` essentially and so it happenes that `--grep` matches not only the first line of the message but the whole log message. So if the log message contained reference to the cherry-picked PR it was seen as merged. This change adds ( ) around and $ to the regexp to match not only the PR number but also parentheses around. (cherry picked from commit eb07618)
potiuk added a commit
to potiuk/airflow
that referenced
this pull request
Aug 15, 2023
This is a more complete fix to apache#33411. This is also a follow up on earlier implementation of apache#33261 that addressed checking if PRs are merged. This one applies the same pattern to finding commit but also improves it by checking if the (#NNNNNN) ends the subject - so even if the PR is in the same form in the message, it will be filtered out. The previous "--reverse" quick fix in apache#33411 had potential of problem in case there were releated PRs merged before the original PR (which is quite posssible when you have a series of PRs referring to each other.
potiuk added a commit
that referenced
this pull request
Aug 15, 2023
…3418) This is a more complete fix to #33411. This is also a follow up on earlier implementation of #33261 that addressed checking if PRs are merged. This one applies the same pattern to finding commit but also improves it by checking if the (#NNNNNN) ends the subject - so even if the PR is in the same form in the message, it will be filtered out. The previous "--reverse" quick fix in #33411 had potential of problem in case there were releated PRs merged before the original PR (which is quite posssible when you have a series of PRs referring to each other.
ferruzzi pushed a commit
to aws-mwaa/upstream-to-airflow
that referenced
this pull request
Aug 17, 2023
…ache#33418) This is a more complete fix to apache#33411. This is also a follow up on earlier implementation of apache#33261 that addressed checking if PRs are merged. This one applies the same pattern to finding commit but also improves it by checking if the (#NNNNNN) ends the subject - so even if the PR is in the same form in the message, it will be filtered out. The previous "--reverse" quick fix in apache#33411 had potential of problem in case there were releated PRs merged before the original PR (which is quite posssible when you have a series of PRs referring to each other.
ephraimbuddy pushed a commit
that referenced
this pull request
Aug 28, 2023
…3418) This is a more complete fix to #33411. This is also a follow up on earlier implementation of #33261 that addressed checking if PRs are merged. This one applies the same pattern to finding commit but also improves it by checking if the (#NNNNNN) ends the subject - so even if the PR is in the same form in the message, it will be filtered out. The previous "--reverse" quick fix in #33411 had potential of problem in case there were releated PRs merged before the original PR (which is quite posssible when you have a series of PRs referring to each other. (cherry picked from commit 3766ab0)
97 tasks
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The
airflow-githubtooling had a check if PR has been already merged, but the PR did not work well when there was already a PR cherry-picked that referred the PR in question in their log message.The check was done via
git log --grep=#PRessentially and so it happenes that--grepmatches not only the first line of the message but the whole log message. So if the log message contained reference to the cherry-picked PR it was seen as merged.This change adds ( ) around and $ to the regexp to match not only the PR number but also parentheses around.
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.