| commit | 1f834ad6f02001d7ef7267f174e49d9c36506326 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Wed Jan 15 12:11:20 2020 +0100 |
| committer | Edwin Kempin <ekempin@google.com> | Wed Jan 15 15:24:37 2020 +0100 |
| tree | 126ee3c45196e66a7b273d7a51ddb269919dcafe | |
| parent | 417233022d791cfaeb298efca40e971b62250e1b [diff] |
Do not fail with 500 ISE if base of merge change cannot be computed due to NoMergeBaseException If the repository content doesn't allow us to compute an auto-merge commit for the base of a merge change because JGit cannot find a merge base (e.g. due to CONFLICTS_DURING_MERGE_BASE_CALCULATION), we now return '409 Conflict' for the ListFiles and change-edit-related REST endpoints. If the files were supposed to be included into a ChangeInfo / RevisionInfo we ignore the failure and just do not populate the file list (but we log a warning). Letting the request succeed in this case is better, as the caller can at least get the rest of the change and revision information. Treating NoMergeBaseException as '409 Conflict' is consistent with how we treat this exception in other places (e.g. in the CreateChange REST endpoint). Change-Id: I78b4636c23635048eedf2a1e4b1075eb87ecb262
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 7 based Gerrit image:
docker run -p 8080:8080 gerritforge/gerrit-centos7[:version]
To run a Ubuntu 15.04 based Gerrit image:
docker run -p 8080:8080 gerritforge/gerrit-ubuntu15.04[:version]
NOTE: release is optional. Last released package of the version is installed if the release number is omitted.