| commit | 430ac9bf30208f371690813f6a77e059a0900526 | [log] [tgz] |
|---|---|---|
| author | Patrick Hiesel <hiesel@google.com> | Thu Mar 18 10:12:13 2021 +0100 |
| committer | Patrick Hiesel <hiesel@google.com> | Fri Mar 19 13:57:08 2021 +0100 |
| tree | 9dc2f3fdc7f6b7947b744f92bc55620602fa4cc3 | |
| parent | 2425b53eed4d39270e91d540142833daba87d01f [diff] |
Compute AutoMerge commits synchronously when processing merge commits Gerrit allows users to compare a patch set that is a merge commit against a plain merge of the patch sets parents in Git. This allows users to spot any manual modifications that the change owner might have made. To do so, Gerrit computes that plain merge and stores it in Git. Previously, that merge was computed and stored when first requested. This led to situations where Gerrit processed read requests and while processing attempted a Git write. That slows these requests down and makes debugging hard. This commit changes that behavior so that we compute the auto merge patch set synchronously when processing a git push. The ref update is added to the existing ref transaction, so it's only created if the push succeeds. When retrieving auto merge commits that are missing, we compute them in-memory. A new counter is added to track how often this happens. Change-Id: Iebb1a5a8d017250fa451a5ff40a12ef9b3f136a5
Gerrit is a code review and project management tool for Git based projects.
Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.
Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.
For information about how to install and use Gerrit, refer to the documentation.
Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.
Please report bugs on the issue tracker.
Gerrit is the work of hundreds of contributors. We appreciate your help!
Please read the contribution guidelines.
Note that we do not accept Pull Requests via the Github mirror.
The Developer Mailing list is repo-discuss on Google Groups.
Gerrit is provided under the Apache License 2.0.
Install Bazel and run the following:
git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
cd gerrit && bazel build release
The instruction how to configure GerritForge/BinTray repositories is here
On Debian/Ubuntu run:
apt-get update & apt-get install gerrit=<version>-<release>
NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.
On CentOS/RedHat run:
yum clean all && yum install gerrit-<version>[-<release>]
On Fedora run:
dnf clean all && dnf install gerrit-<version>[-<release>]
Docker images of Gerrit are available on DockerHub
To run a CentOS 8 based Gerrit image:
docker run -p 8080:8080 gerritcodereview/gerrit[:version]-centos8
To run a Ubuntu 20.04 based Gerrit image:
docker run -p 8080:8080 gerritcodereview/gerrit[:version]-ubuntu20
NOTE: release is optional. Last released package of the version is installed if the release number is omitted.