From 94080d60effd1c7249bc011f2fd1172f83f945a8 Mon Sep 17 00:00:00 2001 From: Luis Hector Chavez Date: Thu, 20 Oct 2016 15:34:17 -0700 Subject: [PATCH] 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 --- GLOBAL-PREUPLOAD.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GLOBAL-PREUPLOAD.cfg b/GLOBAL-PREUPLOAD.cfg index effde48..2060b5d 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 -- 2.11.0