This repository has been archived by the owner on Feb 9, 2022. It is now read-only.
merge-patches: support branch suffixes #113
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
Prior to this change, get_rhel_patches_branch() was translating a Debian dist-git branch "ceph-2-ubuntu-hotfix-bz123" to "ceph-2-rhel-patches", stripping the suffix. The result was that merge-patches cannot fetch changes from a RHEL -patches branch if it's a hotfix (or anything else special). We need it to preserve the suffix in these cases, so merge-patches will work with hotfix branches.
ktdreyer
force-pushed
the
merge-patches-branch-suffixes
branch
from
1988353
to
b111528
Compare
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.
Prior to this change,
get_rhel_patches_branch()was translating a Debian dist-git branchceph-2-ubuntu-hotfix-bz123toceph-2-rhel-patches, stripping the suffix.The result was that merge-patches cannot fetch changes from a RHEL -patches branch if it's a hotfix (or anything else special).
We need it to preserve the suffix in these cases, so merge-patches will work with hotfix branches.