94080d60ef
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
14 lines
522 B
INI
14 lines
522 B
INI
# Settings in here control defaults for `repo upload` checks for all projects
|
|
# 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
|
|
|
|
[Tool Paths]
|
|
clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
|
|
git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
|