Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not suffix MR name with merge strategy if only one is chosen #68

Merged
merged 1 commit into from
Dec 6, 2019
Merged

Do not suffix MR name with merge strategy if only one is chosen #68

merged 1 commit into from
Dec 6, 2019

Conversation

guillaumelecerf
Copy link
Contributor

@guillaumelecerf guillaumelecerf commented Dec 4, 2019

In 44b8b5a#r36271968, the loop on ChangeRequestCheckoutStrategy has been modified, but the check for the number of them has not been updated, resulting in MR names being always suffixed with the strategy used (-head or -merge), even when there is only one chosen.
strategies.size() must be changed to actually be the size of the Set<ChangeRequestCheckoutStrategy>, and not the size of the Map<Boolean, Set> which will always be > 1.

Copy link
Member

@LinuxSuRen LinuxSuRen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@guillaumelecerf guillaumelecerf changed the title Fix MR name Do not suffix MR names with merge strategy if only one is chosen Dec 5, 2019
In 44b8b5a, the loop on ChangeRequestCheckoutStrategy has been modified, but the check for the number of them has not been updated, resulting in MR names being always suffixed with the strategy used (-head or -merge), even when there is only one chosen.
@guillaumelecerf guillaumelecerf changed the title Do not suffix MR names with merge strategy if only one is chosen Do not suffix MR name with merge strategy if only one is chosen Dec 5, 2019
@LinuxSuRen LinuxSuRen merged commit 2a0607e into jenkinsci:master Dec 6, 2019
@guillaumelecerf guillaumelecerf deleted the fix_mr_name branch December 6, 2019 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants