commit | 29445062ad2755a0806985073050423e5e75850f | [log] [tgz] |
---|---|---|
author | Sven Selberg <svense@axis.com> | Tue Nov 15 11:25:16 2016 +0100 |
committer | David Pursehouse <dpursehouse@collab.net> | Wed Nov 16 11:21:24 2016 -0800 |
tree | 11c3fbb753df75a28b8734365baa8b94387e6d30 | |
parent | df0145d52fee1ca9e9cf8c95bfc579eb5f33cef2 [diff] |
Allow submit of merge of non change branch Commit a61b6eed5337049a7feb58ac935543624f107129 introduced a bug that prevents mergeing of a branch that is not a change. It marks the branch to be merged into as uninteresting whereas the branch that gets merged is not, which causes Gerrit to think that it is not allowed to merge it resulting in MISSING_DEPENDENCIES error. In the case where the walk hits a commit that does not have canMergeFlag and is not in the commits to be submitted, check if commit is already merged. Bug: Issue 4930 Change-Id: Ib4f95ebe336e381d6fcbf36867e84d927ac13eb1
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 IRC channel on freenode is #gerrit. An archive is available at: echelog.com.
The Developer Mailing list is repo-discuss on Google Groups.
Gerrit is provided under the Apache License 2.0.
Install Buck and run the following:
git clone --recursive https://gerrit.googlesource.com/gerrit cd gerrit && buck 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>]
NOTE: release is optional. Last released package of the version is installed if the release number is omitted.