Hi!
We have upgraded Bitbucket to 5.3. from 4.14 version.
And now our preceive hook can match merge commits.
private final Pattern mergeBranchPattern =
Pattern.compile("Merge.*");
boolean isMerge = false;
String mergeBranch = "";
Collection<MinimalCommit> parents = cs.getParents();
if (parents.size() > 1) {
Matcher m = mergeBranchPattern.matcher(comment);
if (m.find()) {
isMerge = true;
mergeBranch = m.group();
} else {
rejects.add("Merge commit message should start from word \"Merge...\"");
return rejects;
}
Could you help which changes was on 5.3. version for merge commits?
Thank you
Additional info about Merge strategies:
--no-ff
BR,
Gonchik
This condition is helped
private final String pullRequestEvent ="pull-request-merge";
String eventTrigger = repositoryHookRequest.getTrigger().getId();
if (eventTrigger.equalsIgnoreCase(pullRequestEvent)) {
log.info("Excepted Merge Pull request");
return RepositoryHookResult.accepted();
}
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.