How to check on preceive hook merge commit?

Gonchik Tsymzhitov Community Champion Sep 25, 2017

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: 

Merge commit--no-ff

 

BR,

Gonchik

 

1 answer

1 accepted

This widget could not be displayed.

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();
}

  

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Aug 21, 2018 in Bitbucket

Branch Management with Bitbucket

As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...

1,296 views 8 11
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you