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 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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

174 views 20 8
Join discussion

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