Guardrails / git

No merge commits

git/no-merge-commits@v1

The build range contains no merge commits.

Id	git/no-merge-commits
Version	v1
Category	git
Default severity	warning
Interpreter	python3
Timeout	60 seconds
Violations tolerated	0
Collects	git

Collectors

This guardrail gathers nothing itself. It depends on the collectors below, which the CLI runs once per build before any check, and reads what they found out of GUARDRAIL_FACTS. A collector that collects nothing skips this guardrail rather than failing it.

Collector	Gathers	Inputs it is given
git	The repository, HEAD, the remotes, and every commit between the base ref and HEAD with its message, author, parents and the files the range changed.	baseRef

The inputs above are this guardrail's own, passed straight through. Configuring one in buildnote.json changes what is collected, and two guardrails configured the same way share the one collection.

Configuration

{
  "guardrails": {
      "failOn": "error",
      "comment": true,
      "checks": [
          {
              "use": "git/no-merge-commits@v1",
              "severity": "warning",
              "with": {
                  "baseRef": "origin/main"
              },
              "exemptions": []
          }
      ]
  }
}

Inputs

Input	Description	Default	Environment variable
baseRef	Ref the range starts at. The commits checked are <baseRef>..HEAD.	origin/main	GUARDRAIL_INPUT_BASEREF

How to fix

Rebase your branch onto the base ref instead of merging into it:

git fetch origin
git rebase origin/main

See Git Branching: Rebasing.

More in git

• git/author-identity-domain. Every commit in the build range was authored and committed by an address on a domain the organisation controls.
• git/changed-files-budget. The build range changes few enough files that a reviewer can hold the whole change in their head.
• git/conventional-commits. Every commit message in the build range follows the Conventional Commits specification: the subject line, the blank line before the body, and the BREAKING CHANGE footer.
• git/no-wip-commits. The build range carries no commit that says it was never meant to be merged.
• git/work-item-reference. Every commit in the build range, or the branch it is on, names the change record it belongs to.

All 6 git guardrails