Differences between revisions 22 and 23
Revision 22 as of 2017-11-09 17:37:16
Size: 27700
Editor: brobecke
Comment: document changes made to disable all checks on revert commits
Revision 23 as of 2017-12-13 13:32:25
Size: 27994
Editor: brobecke
Comment: document the new hooks.style-checker-config-file config option
Deletions are marked like this. Additions are marked like this.
Line 234: Line 234:
 * '''{{{hooks.style-checker-config-file}}}''':
 
   If provided, the name of a config file, relative to the repository's
   root directory, to be used as a repository-specific configuration file
   for the style_checker, via the {{{--config CONFIG_FILENAME}}} command-line
   option.
 

Git Hooks Users Guide

This document provides a quick reference towards using AdaCore's "Git Hooks", which are the scripts used to manage our git repositories, when new commits get pushed. These scripts are typically responsible for pre-commit checks, and email notifications.

The source for these hooks can be found at: https://github.com/adacore/git-hooks

Enabling the hooks

The hooks have been designed to work with both bare and non-bare repositories. But typical usage will be with bare repositories.

o enable the hooks, an administrator needs to replace the "hooks" directory in your git repository by a link to the /hooks directory from a git-hooks checkout, and configure them as outlined below.

Minimum Configuration

The following config options must be set for all repositories. Updates of any kind will be rejected with an appropriate error message until minimum configuration is satisfied.

  • hooks.from-domain

  • hooks.mailinglist

See below for a description of these config options.

Configuration

Configuration File location

The hooks configuration is loaded from a file named project.config in branch refs/meta/config. This file follows the same format as the various git "config" files (Eg. $HOME/.gitconfig).

To update your repository's configuration, you will need to do the following:

  • Check the refs/meta/config branch out;

  • Modify project.config accordingly;

  • Check your change in;
  • Push the updated branch.

Updating the Configuration File

To update your repository's configuration, you will need to do the following

  • Download the existing configuration from Gerrit:

  $ git fetch origin refs/meta/config
  $ git checkout FETCH_HEAD
  • You are now in detached HEAD mode

  • Update the project.config file to add/update the git-hooks configuration.

    • This can be done using the git config command. For instance:

  $ git config -f project.config --add hooks.from-domain adacore.com
  $ git config -f project.config --add hooks.mailinglist ide-ci@adacore.com
  • Verify the project.config file, and in particular the new [hooks] section:

  [hooks]
      from-domain = adacore.com
      mailinglist = ide-ci@adacore.com
  • Commit the configuration change, and push it back:

  $ git commit -a -m "Notify ide-ci@adacore.com of changes"
  $ git push origin HEAD:refs/meta/config

General Information about Configuration Options

Some of the configuration options supported by git-hooks are lists (Eg: a list of references). For such options, the value of that configuration option can be specified with either:

  • One entry in the configuration file, with with element of the list separated with comas; Eg:

    no-emails = refs/heads/fsf-.*, refs/heads/thirdparty

  • One entry in the configuration file per element in the list; Eg:

    no-emails = refs/heads/fsf-.*
    no-emails = refs/heads/thirdparty

Configuration Options for General Use

The following config options are available for general use:

  • hooks.allow-delete-tag (default value: false):

    • By default, deleting a tag is not allowed. To allow it, set this option to true.

  • hooks.allow-non-fast-forward [list]:

    • A list of regular expressions matching branch names (NOT reference names; ie 'master', not 'refs/heads/master').

      By default, non-fast-forward updates are only allowed on 'topic' branches (ie branches whose name start with topic/. This option allows us to extend the list of branches where non-fast-forward updates are allowed.

  • hooks.allow-lightweight-tag (default value: false):

    • Lightweight Tags (as opposed to Annotated Tags) are really not meant to be shared, and thus the hooks will reject updates that create a new lightweight tag, unless this config option is defined to true.

  • hooks.combined-style-checking (default value: false):

    • By default, the pre-commit checks are performed on each commit individually. This ensures that none of the commits introduce some style violations. But some developers have found that this policy gets in the way more than it helps, and thus requested that the pre-commit checks be performed on the combination of all commits.

      The general recommendation is to keep commit-by-commit style checks. But to enable combined style-checking, set this config option to true.

  • hooks.commit-url:

    • If defined, a URL to be provided at the start of every commit email notification. The following placeholders can be used:
      • %(ref_name)s: The name of the reference being changed;

      • %(rev)s: The commit's SHA1.

      Python string substitution is applied, so % characters must be escaped using %%.

  • hooks.disable-email-diff (default value: False):

    • If True, "diffs" are not included in the emails describing each new commit.

  • hooks.disable-merge-commit-checks (default value: false):

    • If set to True, disable the precommit-check in charge of detecting [#UnintentionalMergeCommitsCheck unintentional merge commits].

      /!\ The use of this option is strongly discouraged, as it helps catching mistakes that are easily done, especially by git users who are less experimented.

  • hooks.file-commit-cmd:

    • A command called with each commit triggering a commit notification email. The purpose of this config variable is to allow the use of an adhoc script when the filing of commits in bug tracking software cannot be done simply by just sending an email.
      This provided command is called as is, with the same contents as the commit email minus the "diff" part passed via the script's standard input.

  • hooks.from-domain:

    • The domain name of the email address used in the 'From:' field for all email notifications being sent (the local part of the email address - before the '@' -, is simply the user name on the host where the hooks are running).
  • hooks.frozen-ref [list]:

    • The list of references for which updates are not allowed. This is typically used to prevent users from pushing commits to former development branches which have since been closed. For instance, the following example shows how to disallow changes to the gdb-7.4 and gdb-7.5 branches:

    frozen-ref = refs/heads/gdb-7.4
    frozen-ref = refs/heads/gdb-7.5
  • hooks.ignore-refs [list]:

    • A list of regular expressions matching some reference names for which updates should should be ignored.
      This is mostly meant for sites that use a review system which adds its own layer between the user's repository, and the reference repository for which the git-hooks are installed. By default, it is set to ignore references created by gerrit for internal purposes. Below is an example of how to override that default:

    ignore-refs = refs/heads/ignore-.*
    ignore-refs = refs/heads/internal/

  • hooks.mailinglist:

    • A coma-separated list of email addresses where to send all email notifications.

      An entry can also be a script instead of an email address, in which case the script will be executed to determine the list of recipients for that script. See [#UsingScriptInHooksMailinglist Using a script in hooks.mailinglist] for more details on how this works.

  • hooks.max-commit-emails (default value: 100):

    • This is mostly a safe-guard against updates with unintended consequences in terms of the number of emails being sent out. If an update is pushed such that the update would trigger a number of commit email notifications greater than the value of this config option, the hooks will reject this update.

      Typically, this happens when a developer merges a large number of changes from an external source, and then pushes it into an AdaCore repository.

  • hooks.max-email-diff-size (default value: 100,000):

    • This config option ensures that patches sent out inside commit email notifications do not exceed a certain size, clogging the mailbox of all recipients. Past a certain size, which is configured via this config option, the diff isn't likely to be useful anymore, and thus gets truncated. A small note is added at the end of the truncated diff to indicate that the truncation took place.

  • hooks.max-rh-line-length (default value: 76):

    • The maximum length for each line in the revision log. If any line exceeds that length, the commit will be rejected. Setting this variable to zero turns this check off entirely.

      Note: We used a default limit of 76 characters instead of 80, because git commands have a tendency to indent the revision history by 4 characters. Similarly, the git hooks also send emails where the revision history also gets indented by 4 characters. This limit ensures that all lines of a commit revision history fit in a standard 80-characters wide terminal.

  • hooks.no-emails [list]:

    • A coma-separated list of regular expressions matching some reference names for which updates should not trigger any email notification.
      The example below turns off email notifications for all branches whose name start with "fsf-", as well as the "thirdparty" branch.

    no-emails = /refs/heads/fsf-.*
    no-emails = /refs/heads/thirdparty

  • hooks.no-precommit-check [list]:

    • A list of regular expressions matching some reference names for which pre-commit checks should not be enabled. /!\ Note that this disables all pre-commit checks, including the revision history checks. It is therefore recommended that this option be only used for branches developed outside of AdaCore.

      This is typically used for branches tracking external repositories.
      The example below turns pre-commit-checks off for all branches whose name start with "fsf-", as well as the "thirdparty" branch.

    no-precommit-check = /refs/heads/fsf-.*
    no-precommit-check = /refs/heads/thirdparty
  • hooks. no-rh-style-checks [list]

    • A list of regular expressions matching some reference names for which style-checking of the revision logs should not be enabled. /!\ The use of this option is strongly discouraged for branches maintained by AdaCore.

      {i} Revision History style checks can be disabled for a specific commit by using the sequence 'no-rh-check' in the revision history.
      The example below turns revision logs style-checking off for all branches whose name start with "fsf-", as well as the "thirdparty" branch.

    no-rh-style-checks = /refs/heads/fsf-.*
    no-rh-style-checks = /refs/heads/thirdparty
  • hooks.post-receive-hook:

    • If defined, this is the name of a script to be called at the end of the post-received hook. The script is called exactly the same way the post-received hooks is called, and therefore should allow customized post-receive processing.

      /!\ the current working directory (cwd) when this script gets called is undefined, so it is recommended to provide a full path to that script.

  • hooks.reject-merge-commits [list]:

    • A list of regular expressions matching some reference names for which merge commits are not allowed.
      The example below causes merge commits to be rejected on branch "master" and all branches whose name start with "gdb-".

    reject-merge-commits = refs/heads/master
    reject-merge-commits = refs/heads/gdb-.*
  • hooks.style-checker (default value: style_checker):

    • If provided, the program to call when performing style checks. It is expected that this program follow the same calling convention as style_checker:

      • The first argument is a dummy argument mimicking an SVN path, and can be ignored;
      • The second argument is the name of the file to be checked, relative to the project's root directory (Eg: path/to/filename.adb). The style-checking program is called with the Current Working Directory (CWD) such that opening that file can be done using the given (relative) filename.

      It is recommended that, unless located in a very standard location always included in the PATH (Eg: /usr/bin), the full path to the program be specified.

  • hooks.style-checker-config-file:

    • If provided, the name of a config file, relative to the repository's root directory, to be used as a repository-specific configuration file

      for the style_checker, via the --config CONFIG_FILENAME command-line option.

  • hooks.tn-required (default value: false):

    • If set to true, the hooks verify that the revision history of all new commits contain a Ticket Number, and reject the update if it is not the case.

      This requirement can be by-passed by using the sequence 'no-tn-check' or the word 'minor' in the revision history, in lieu of the Ticket Number.

Configuration Options for Debugging

The following config options are recognized, but are only meant to be used for debugging/testing purposes. They should not be used during normal operations.

  • hooks.bcc-file-ci (default value: true):

    • Setting this config option to false prevents the hooks from Bcc'ing file-ci@adacore.com in all emails sent. This option should never be used in any official repository, and is only meant to for testing of the git hooks outside of the testsuite.

  • hooks.debug-level (default value: 0):

    • Setting this debug option to a value higher than zero turns debugging traces on. The higher the value, the more verbose the traces.

Pre-commit Checks

"Revert" commits

In order to avoid unnecessary complications while reverting a commit that is causing problems, all pre-commit checks (revision log, style checks) are deactivated for commits created by "git revert".

Since there is no reliable feature that we can use to identify these commits, the git-hooks rely on a heuristic instead, and look for a pattern in the commit's revision log that gets automatically inserted by the "git revert" command. In particular, at the moment, we look for the following pattern:

  • This reverts commit

Pre-commit Checks on the Revision History

The hooks verify that the revision histories of all new commits being pushed comply with the rules defined below. This step is skipped for any commit whose revision history contains the 'no-rh-check' sequence.

Rules enforced on the revision logs:

  • Empty line after subject line

    • By convention, the first line of the revision history should always be the subject of the commit. If additional text is required, an empty line should be inserted between the subject and the rest of the revision history.

YES:
      | The subject of my commit - no other explanation required.

YES:
      | The subject of my commit
      |
      | This is what this commit does.

NO:
      | The subject of my commit
      | This is what this commit does, but an empty line is missing
      | between the subject and this description.
  • Maximum line length in revision history:

    • See [#ConfigMaxRHLineLength hooks.max-rh-line-length].

  • Unedited revision history of merge commits

    • The purpose of this rule is to prevent a merge commit which was unintentionally created to be pushed to the shared repository. This can easily happen when, for instance, forgetting the --rebase option when doing a git pull.

      It works by detecting the default text that git uses as the revision history when the merge does not trigger a merge conflict.
      When a merge was in fact intentional, the revision history of the merge commit must be manually edited to avoid the "Merge branch '[...]" line that git uses by default as the subject of the merge commit. Doing so will satisfy this pre-commit check.

      {i} Although strongly discouraged, this check can be disabled by setting the [#ConfigDisableMergeCommitChecks hooks.disable-merge-commit-checks config option] to True.

  • Merge conflict section

    • When creating a merge commit during which conflicts were discovered and had to be resolved, the default revision history created by git and proposed for edition contains a section at the end that lists the files inside which merge conflicts where found. We do not want this section in the revision history of our commits, so the hooks verify that the author of the commit remembered to delete it.
  • Missing Ticket Number

    • This check is enable only if the hooks.tn-required config option is set. For such repositories, the hooks verify that the revision history contains a Ticket Number.
      This requirement can be by-passed via the use of the word "Minor" (Eg. "Minor reformatting"), or via the sequence "no-tn-check". Casing is not taken into account for this rule.

Filename Collisions Pre-commit Check

On Operating Systems such as Darwin or Windows, where the File System is typically case-insensitive, having two files whose name only differ in the casing (Eg: "hello.txt" and "Hello.txt", or "dir/hello.txt" vs "DIR/hello.txt") can cause a lot of confusion. To avoid this, the hooks will reject any commit where such name collision occurs.

This check is disabled on the branches matching the hooks.no-precommit-check config value, or if a valid $HOME/.no_cvs_check file is found (see below).

Pre-commit Checks on the Differences Introduced by the Commit

This is the usual "style check" performed by the style_checker program.

Note that the program verifies the entire contents of the files being modified, not just the modified parts.

Controlling the Pre-commit Checks

/!\ Despite the use of very similar names, note the fairly important difference in scope between the hooks.no-precommit-checks config option, and the no-precommit-check git attribute! (see below)

By default, the pre-commit checks are turned on for all commits of all branches. The following controls are available to tailor the hooks' behavior regarding this check:

  • The hooks.no-precommit-check config option can be used to turn pre-commit checks off entirely for a given branch. This option is typically used for branches tracking other branches from a third-party repository.

  • If the no-precommit-check string is found anywhere in the revision log of that commit, pre-commit checks are also turned off entirely, but only for that commit.

  • The $HOME/.no_cvs_check file, if less than 24 hours old and located on the machine running the hooks, will also turn all pre-commit checks off entirely.

  • Setting the hooks.combined-style-checking config option tells the hooks that the second part of the pre-commit checks (operating on the differences introduces by the commits) to only check the final result. Thus, if a user pushes an update introduces two new commits C1 and C2, it does not matter if C1 contains a style-check violation as long as the violation is corrected in C2.

    • It is important to note, however, that the pre-commit checks on the revision histories are still performed on a commit-per-commit basis. Otherwise, it would be possible to push a commit missing a Ticket Number in repositories that are configured to require one.

  • The no-precommit-check git attribute. Setting this attribute for any given file disables the pre-commit checks for this file. See git --help attributes for more info on how to set those attributes.

    • Normally, it is preferred that these attributes be maintained via a .gitattributes file which is checked in the repository. This makes everything properly tracked. But there may be situations where this is not convenient (Eg: trying to avoid a local change in a branch tracking another branch from a third-party repository). For those situations, it is possible to define the attribute in the GIT_DIR/info/default_attributes file inside the shared repository. The downside of this approach is that this file is not tracked.

Email Notifications

In general, developers are notified via email whenever a change is pushed to the repository. This section describes the policy used to determine which emails are being sent.

The Summary Email

The purpose of this email is to give a quick overview of what has changed.

Composition

The Summary Email is composed of two sections:

  1. A short description of what has changed. For instance, if a tag was created, it will explain what kind of tag was created, what the associated revision log was, and what commit it points to.
  2. Optionally, a list of commits which have been lost and/or added.

Sending Policy

The general policy is to send the Summary Email for all updates in order to inform its developers about the change. However, there are a number of situations where the email would bring little information to the Commit Emails already sent out:

  • Branch updates: If the update does not cause any commit to be lost, nor does it include commits from a branch matching the hooks.no-emails configuration, then the email is superfluous and therefore not sent.

  • Notes updates: Notes are really a special case of branch handling, where only fast-forward updates are allowed, and where the hooks.no-emails configuration is ignored. So the Summary Email is also never sent.

Filing Policy

Normally, this email is not used for filing purposes (ie, a copy is not even sent to file-ci@), as we are more interested in filing the individual commits than the summary.

However, it is interesting to file those emails in the following cases:

  • tag creation
  • tag update

In those cases, the revision log attached to those tags may contain a TN, which means this event deserves filing.

In either case, a Diff: marker is always added before the section summarizing the list of commits that were lost and/or added, making sure that this part of the email never gets filed, as the commits themselves are already getting filed.

The Commit Emails

Composition

The subject of that email is the commit's subject and its contents is roughly what the git show command would display.

Sending Policy

The Commit Email is always sent, unless the commit is found to exist in a branch matching the hooks.no-emails configuration.

Filing Policy

This email is always bcc'd to file-ci@. Note that this list must not appear in any explicit To:/Cc: header, as we want to prevent any replies from being sent there.

Using a script in hooks.mailinglist

For projects that share the same git repository but want separate email addresses for email notifications, it is possible to use a script in place of an email address in the hooks.mailinglist config. Script entries are indentified by the fact that the entry is an absolute filename, and that this filename points to a file on the server which an executable.

{i} Note that the "term" script is used loosely here as, although we expect most users of that feature to indeed use a script, a compiled program would work just as well.

Script Calling Convention

This script is called by the hooks as follow:

  • The list of files being changed is passed via standard input, one file per line (this list may be empty);
  • NO ARGUMENT is currently being passed on the command line, but we might use that in the future to provide info such as the reference name, for instance.

The hooks expects the script to return the list of email addresses on standard output, one email address per line.

By convention, we expect the scripts to return all email addresses when the given list of files being changed is empty. This is useful for "cover" emails that the hooks want to send to everyone.

Script Email Expansion Policy for Commit Emails

For commit emails, the hooks will call the mailinglist script with the list of files being changed by the commit, and let the script decide who should be notified based on that list of files.

Script Email Expansion Policy for Git Note Update Emails

Git Note Update emails are similar to Commit Emails, and therefore the distribution list will be computed based on the list of files being changed. The only difference is that the list of files is going to be the list of files in the commit being annotated, not the note's commit.

Script Email Expansion Policy for "Cover" Emails

The expansion policy for cover emails is currently very simple: Send to everyone.

Rationale:

  • Branch Updates:
    • For branch creation and deletion, it seems easy to understand how there is little way for us to determine who is interested in that branch update, unless we provide the name of the branch to the script. We might do that at some point, but keep things simple for now.
    • For branch update, if we have a cover letter, it means we have either commits already in another branch, or we're losing commits. Either should be relatively rare since merges are discouraged, and non-fast-forward changes are forbidden. So, it seems simple enough to send to everyone.
  • Tags:
    • Althought it might be tempting to say to say that the notification should be same to the same list as the target's commit, this does not work: It is entirely possible that a tag for a given project point to a commit that only touches files for another project (Eg: a branchpoint tag, for instance). So, tags should be really treated the same was a branches.

Retiring Old Branches

The recommended method for retiring a branch which is no longer useful is to add a hooks.frozen-ref in the project's project.config file which lists the branch's reference name. Eg:

    [hooks]
        frozen-ref = refs/heads/gdb-7.5

Alternatively, the following (legacy) method is also available:

  • Create a tag referencing the tip of the branch to be retired.
    • The tag name should be retired/<branch-name> where <branch-name> is the name of the branch to be retired.

  • Push this tag to the official repository;
  • Delete the retired branch in the official repository.

By using the naming suggested for the tag, the hooks will ensure that the branch never gets accidently recreated. This would otherwise happen if a developer did not know that the branch was deleted, still had that branch locally in his repository, and tried to push his change as usual.

The use of the retired/ namespace for those tags also helps standardizing the location where those tags are created.

And the use of a tag allows everyone to determine the latest state of that branch prior to its retirement.

None: GitHooksUsersGuide (last edited 2017-12-13 13:32:25 by brobecke)

All content (C) 2008 Free Software Foundation. For terms of use, redistribution, and modification, please see the WikiLicense page.