User Guide 3.0.x

This versions will no longer supported

This versions are no longer supported, please upgrade to 3.1.x or later

What can be checked?

	Push	Merge	Description
Commit needs issue key	AVAILABLE	AVAILABLE	A push or merge can be done only, if at least one commit of a push contains valid issue key reference
All commits needs a issue key	AVAILABLE	AVAILABLE	A push or merge can be done only, if all commits of a push contains a valid issue key reference
Issue status	AVAILABLE	AVAILABLE	A push or merge can be done only, if the related issue is in the configured status. The status can be configured via regular expression.
Branch naming convention	AVAILABLE	N/A	The name of a new branch, will be checked. If a new branch do not match the naming convention, the push will be blocked. The naming convention can be configured via regular expression.
Squash check	AVAILABLE	N/A	A push with more than one commit will be blocked. A push is only allowed, if branches contains exact one commit. If the branch contains more than one commit, the commits need to be squashed.
Merge commit check	AVAILABLE	N/A	A push can be done only, if the push contains no merge commit. This will enforce, that merges will be done via Stash only. If a merge has been done with a different tool (e.g. SourceTree/SmartGit or simple in console) the resulting merge commit will be blocked.
JQL check	AVAILABLE	AVAILABLE	A push or merge can be done only, if the related issue matchs a given JIRA JQL expression.
Rebase check	N/A	AVAILABLE	Force a rebase of the source branch before a integration merge can be done. If a rebase is possible and makes sense, the merge is not allowed without rebasing the branch first. In result this check enforces the "The Rebase Option" in the following tutorial: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/conceptual-overview Attention It is recommended to use this option on private forks only. The rebase strategy can be used with the force push only, which could have influence to other team members. Use this strategy carefully in a public repository. See also pros and cons in this Atlassian article https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase/
Syntax check	AVAILABLE	AVAILABLE	A push or merge can be done only, if all commits match a specified syntax. This syntax can be configured based on regular expression.

Configuration of the hooks

Common Check Configuration

This configuration possibilities are available in the push hook and in the merge hook.

Fields

Description

Example

Syntax check

If this option is enabled, the related text field should contain a regular expression, which will define the syntax of the commit messages.

If the option is set, and the following regular expression is given,

^\[([A-Z]+)-(\d+)\](.|\n)+

then each commit message must start with a issue key, which is in brackets. Additionally after the key there must be a further description (e.g. "[TEST-1] further text" will be accepted. Only "[TEST-1]" as commit message will not be accepted. Also "TEST-1 and some further text" will not be accepted, because of the missing brackets. If the commit message do not match, the push or merge is blocked.

Issue status

If this option is enabled, the related text field should contain a regular expression, which will define the valid status of issue key references.

Attention

In version previous 2.x, the status list was not based on regular expression. It was just a comma separated field.

If the option is set, and the following regular expression is given,

Reviewed|Integration Request

then a merge or a push can be done only, if the issue status is "Reviewed" or "Integration Request". (Of course also a more complex regular expression is possible.)

Attention

If you have a international company and if you will support different languages, then you have to respect this in the regular expression. For example the regular expression

To Do|Aufgabe

will support the german and english version of the related status.

JQL check

If this option is enabled, the related text field should contain a valid JIRA JQL expression. A commit will be accepted only, if all issue key references will match the given JQL

If the option is set, and the following JQL is given,

(assignee=benni and fixVersion is not EMPTY)

then a given issue reference will be checked with this JQL. So a merge or push is only possible, if the assignee is the user "benni" and the fix version is set to any version.

(assignee=$currentUser)

You can also use the keyword "$currentUser", which will be replaced with the user wich will execute the merge or push. So the JQL ensure that the merge/push can only be done by the assignee of the issue.

Issue-key Check

If this options are set, a issue key must exist. Additionally the issue key must reference a valid issue in JIRA.

There are two possibilities to check issue-keys:

At least one issue key reference must be available in any commit of a push
All commits of a push must have a valid issue key reference

This is a push example, but the behavior regarding the merge hook is the same.

Message	At least one	All
git commit -m 'TEST-1 this is a example' git push	ACCPETED	ACCPETED
git commit -m 'TEST-1 This is a example' git commit -m 'This is a example' git push	ACCPETED	ACCPETED

Common Condition Configuration

Fields

Description

Example

Enabled branches

If this option is enabled, the related text field should contain a regular expression, which will define the branches. If the branch will match the regular expression, the merge/push will be checked. If the branch will not match, the checks will be skipped.

If the option is set, and the following regular expression is given,

master|develop

then the checks will be validate only if:

you will push commits in the master or develop branch
you will merge pull requests in the master or develop branch

If you will push or merge change-sets in a branch with a other name, then the checks will not be evaluated and the merge/push is always allowed.

Exception

If this option is enabled, the related text field should contain a valid user group. If the user which will do the merge/push is in the given group, then the checks will not be evaluated.

This is a push example, but the behavior regarding the merge hook is the same.

If the option is set, and the group admin is configured. Additionally there are several commits which would block a push or merge (e.g. no issue key reference is available), then the behaviour is:

Usecase	User	Group	Result
git commit -m 'this is a example' git push If the option "Issue Key Checks" is enabeled the following push will be rejected. But if a administrator will push the changes, all checks will be skipped. The result is that the administrator can push changes also, if the checks would block the push.	Administrator	admin	ACCPETED
git commit -m 'this is a example' git push The push will be blocked, because the user Benjamin is not in the user group admin.	Benjamin	stash-users	ACCPETED

Merge-Check Configuration

In the "Merge check" configuration page, the above mentioned checks can be enabled and configured. Additionally the rebase strategy can be configured.

Fields

Description

Example

Rebase check

If this option is enabled a merge can only be done only, if in the master are no newer commits. If there are newer commits, which are not in the source branch, the source branch must be rebased on to the top of the target branch. This will create a clean branch-merge picture and will resolve merge conflicts in a early stage.

Commit Graph	Result
"master" ---- A ---- B ---- C \ \ "feature" FA -- FB -- FC	ACCPETED
git checkout feature git rebase master git push -f "master" ---- A ---- B ---- C \ \ "feature" FA -- FB -- FC	ACCPETED

Push-Check Configuration

In the "Push check" configuration page, the above mentioned common checks can be enabled and configured. Additionally the squash check, branch naming check and merge commit check can be enabled and configured.

Fields

Description

Example

Squash check

If this option is enabled a push can be done only, if the push contains only one commit. If there are more commits, the push will be rejected. After squashing the commits to one commit the push is allowed again.

Commit Graph	Result
"feature" ---- A ---- B ---- C	ACCPETED
"feature" ---- A	ACCPETED

Merge commit check

If this option is not enabled a push can be done only, if in the push contains no merge commit.

Commit Graph	Option disabled	Option enabled
"branch x" ----- A \ \ "branch y" --- FA -- merge --> push	ACCPETED	ACCPETED

Branch naming convention

If this option is enabled, the related text field should contain a regular expression, which will define the syntax/naming of all new branches. This check will only be executed, if a new branches will be created via a push from a client. The creation of a branch via Stash do not execute this check.

If the option is set, and the following regular expression is given,

branches\\/[bug|feature]+\\/.*

then each new branch needs to match this regular expression.

Branch name	Result
branch/bug/something	ACCPETED
branch/feature/somethingelse	ACCPETED
branch/improvement/something	ACCPETED

How does it have a affect?

How does the merge hooks have a affect?

If one of the configured checks, will be evaluated to false, then a merge will be blocked with a error message.

How does the push hooks have a affect?

If one of the configured checks, will be evaluated to false, then a push will be blocked and the push response prints a detailed error message.