| commit | 7ebbf03fd0c84a03dd0b88b888f25cba42933bfc | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Fri May 31 10:57:38 2024 +0000 |
| committer | Edwin Kempin <ekempin@google.com> | Fri May 31 11:49:20 2024 +0000 |
| tree | 23833ef1b46bba1095a0f719bf15318d4cb5511c | |
| parent | 15583886115bd04f426ee6e2da83fab28544dff0 [diff] |
Fix updating an existing edit via push It should be possible to update an existing edit via push [1], but attempting to so (checkout the edit, amend the commit and then push the edit) fails because updating the edit ref with non-fastword is rejected. By setting the type to UPDATE_NONFASTFORWARD when creating the ReceiveCommand for the edit ref update we allow non-fastforwards (see NoteDbUpdateExecutor#allowNonFastForwards). [1] https://gerrit-review.googlesource.com/Documentation/user-upload.html#:~:text=When%20a%20change%20edit%20already%20exists%20for%20a%20change%20then%20pushing%20with%20%25edit%20replaces%20the%20existing%20change%20edit.%20This%20option%20is%20useful%20to%20rebase%20a%20change%20edit%20on%20the%20newest%20patch%20set%20when%20the%20rebase%20of%20the%20change%20edit%20in%20the%20web%20UI%20fails%20due%20to%20conflicts. Release-Notes: Fixed updating an existing edit via push Bugs: Google b/332704794 Change-Id: Ia609a3c4ef8f949981644f2b36775e962359de48 Signed-off-by: Edwin Kempin <ekempin@google.com>
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.