Change get_commits_since
so that it won't take commits from other branches
#12376
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.
What does this PR do?
Changes the behaviour of
get_commits_since
so that it uses git's..
operator instead of...
to define the commit range.Motivation
AI-2131. This is trying to avoid incorporating commits from non-master branches into releases.
Additional Notes
I'm not sure what the original expected behaviour for this function was, so the reason why
...
was being used originally is unknown to me. I'm also not very confident about my understanding of...
and why it does what it does in this case.To test this manually, based on reproducing the case reported in AI-2131, what I did was:
integrations-core
separately.git checkout 7.34.0-rc.2
ddev -x release make http_check
I also tried the git commands that this function runs to check that
..
gives us what we want for this case:(note the duplicate #11069)
After the change, if I run
ddev -x release make http_check
, I get a changelog that looks right:Also, these are the places where this is used:
Review checklist (to be filled by reviewers)
changelog/
andintegration/
labels attached