Google Git
Sign in
gerrit / plugins / code-owners / cf7622fd7503345feef64f65560ca96dd40892ac
commitcf7622fd7503345feef64f65560ca96dd40892ac[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Tue Mar 23 09:30:17 2021 +0100
committerEdwin Kempin <ekempin@google.com>Tue Mar 23 09:40:22 2021 +0100
tree805a1e6eee538bb48c249762063f531f3c330957
parent602553929c41de6c9930e1dfe82b942e51b221de [diff]
Test code-owners submit rule if auto-merge is missing

If the auto-merge is missing in Git it needs to be computed in memory
when the code-owners submit rule is executed for a merge commit and
mergeCommitStrategy is configured to FILES_WITH_CONFLICT_RESOLUTION.
This was not yet covered by a test and it was failing after change
I2ecce2a86 got submitted (because AutoMerger failed if InMemoryInserter
was passed in but change.cacheAutomerge was true and it attempted to
save the auto-merge). Cover this by a test now. In meantime this has
been fixed by change Iebb1a5a8d so that the test is passing now.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I21abfb90dbcf694607e1b766a92fd5dcb432eb11
1 file changed
tree: 805a1e6eee538bb48c249762063f531f3c330957
  1. java/
  2. javatests/
  3. proto/
  4. resources/
  5. test/
  6. ui/
  7. .eslintrc.json
  8. .gitignore
  9. .gitreview
  10. bower.json
  11. BUILD
  12. LICENSE
  13. package-lock.json
  14. package.json
  15. README.md
README.md

Gerrit Code Review code-owners plugin

This plugin provides support for defining code owners for files in a repository.

If the code-owners plugin is enabled, changes can only be submitted if all touched files are covered by approvals from code owners.

Also see resources/Documentation/about.md.

IMPORTANT: Before installing/enabling the plugin follow the instructions from the setup guide, see resources/Documentation/setup-guide.md.