Define end hash of interest for duplicating PR #1346
Merged
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
…get branch. This merge commit may have multiple parents and there is no way of knowing which parent we should use to search for commits of interest. This allows the user to define the last commit of interest that is not the merge. This will be used to pull the range of commits of interest.
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.
Technical Summary
Resulting from this workflow failure: https://github.com/dimagi/commcare-core/actions/runs/6459548228/job/17535541395
No commits were returning from
git rev-list --no-merges --first-parent 8850102This is because commitaf06064has multiple parents with the8850102being the first. The commits of interest are not between the first parent (8850102) so it returns an empty list. The commits of interest in the PR to be duplicated are contained between the second parent andaf06064. However, there is no way to know without user input. With this change, the user will also define the last non-merge commit in the PR.So in the linked PR, the comment that would lead to correct PR duplication would be
duplicate this PR 628e7a8 2eacb6bSafety Assurance
Safety story
Locally tested, only affects internal tool
Automated test coverage
no automated test
QA Plan
no QA
Special deploy instructions
Rollback instructions
Review
Duplicate PR
Automatically duplicate this PR as defined in contributing.md.