diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-10-20 15:34:17 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-10-20 23:51:24 +0000 |
| commit | 94080d60effd1c7249bc011f2fd1172f83f945a8 (patch) | |
| tree | 58b7bb4716fc1f762d26aeec1ef1a7c08d0d5926 | |
| parent | 162f854d3ff5dd0e9ae7d832d0b1d509e2df9404 (diff) | |
| download | manifest-94080d60effd1c7249bc011f2fd1172f83f945a8.tar.gz | |
Disable merged commit pre-upload checks by default
When merge-commits are uploaded to Gerrit, the merged commits have
usually either already been reviewed elsewhere (in another branch), or
may contain automatically-generated commits that would probably not pass
the pre-upload checks (e.g. lacking a Bug: tag). This change makes it so
that the merge commits are not checked by the hooks, but the
merge-commit itself is.
Bug: 31926893
Test: repo upload
Change-Id: Ic25127fdbaea651cd4bb14e250c26ffe9aa064ad
| -rw-r--r-- | GLOBAL-PREUPLOAD.cfg | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/GLOBAL-PREUPLOAD.cfg b/GLOBAL-PREUPLOAD.cfg index effde4844..2060b5d7c 100644 --- a/GLOBAL-PREUPLOAD.cfg +++ b/GLOBAL-PREUPLOAD.cfg @@ -2,6 +2,9 @@ # listed in the manifest. Do not turn on things here without first consulting # the wider Android team, and make sure you send out a PSA before landing. +[Options] +ignore_merged_commits = true + [Builtin Hooks] commit_msg_test_field = true |