Google Git
Sign in
gerrit / gerrit / 3facbc60330a3ca88a73961a3b9ac7f2b03082f1
commit3facbc60330a3ca88a73961a3b9ac7f2b03082f1[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Thu Dec 22 11:03:15 2016 +0100
committerEdwin Kempin <ekempin@google.com>Wed Jan 11 12:07:50 2017 +0100
tree84f8dcfb4bc664ee46d658805b86a8a35e7feac1
parente3db98f6744d82d7d25eb1aae23b9ca1a6e9952a [diff]
Fix submitting changes with commits that were already merged

Due to bugs it can happen that a change gets into an inconsistent
state where the commit of the last patch set is already merged into
the destination branch, but the change status is still NEW. In this
case the inconsistency should get resolved by submitting the change
again. The submit detects that the commit is already merged and then
only the change status is updated to MERGED.

This already worked for all cases except for Fast Forward Only if
several changes got merged, but stayed open. Then submitting the first
change again was not possible since the MergeUtil.canFastForward
claimed that the change was not mergeable.

Change-Id: I73641f02e58298baf6f13da27d37500a44ad6d2b
Signed-off-by: Edwin Kempin <ekempin@google.com>
2 files changed
tree: 84f8dcfb4bc664ee46d658805b86a8a35e7feac1
  1. .settings/
  2. bucklets/
  3. contrib/
  4. Documentation/
  5. gerrit-acceptance-framework/
  6. gerrit-acceptance-tests/
  7. gerrit-antlr/
  8. gerrit-cache-h2/
  9. gerrit-common/
  10. gerrit-elasticsearch/
  11. gerrit-extension-api/
  12. gerrit-gpg/
  13. gerrit-gwtdebug/
  14. gerrit-gwtexpui/
  15. gerrit-gwtui/
  16. gerrit-gwtui-common/
  17. gerrit-httpd/
  18. gerrit-launcher/
  19. gerrit-lucene/
  20. gerrit-main/
  21. gerrit-oauth/
  22. gerrit-openid/
  23. gerrit-patch-commonsnet/
  24. gerrit-patch-jgit/
  25. gerrit-pgm/
  26. gerrit-plugin-api/
  27. gerrit-plugin-gwtui/
  28. gerrit-prettify/
  29. gerrit-reviewdb/
  30. gerrit-server/
  31. gerrit-sshd/
  32. gerrit-test-util/
  33. gerrit-util-cli/
  34. gerrit-util-http/
  35. gerrit-util-ssl/
  36. gerrit-war/
  37. lib/
  38. plugins/
  39. polygerrit-ui/
  40. ReleaseNotes/
  41. tools/
  42. website/
  43. .bazelproject
  44. .buckconfig
  45. .buckversion
  46. .editorconfig
  47. .gitignore
  48. .gitmodules
  49. .mailmap
  50. .pydevproject
  51. .watchmanconfig
  52. BUCK
  53. BUILD
  54. COPYING
  55. INSTALL
  56. README.md
  57. SUBMITTING_PATCHES
  58. version.bzl
  59. WORKSPACE
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Build Status

Objective

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.

Documentation

For information about how to install and use Gerrit, refer to the documentation.

Source

Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.

Reporting bugs

Please report bugs on the issue tracker.

Contribute

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.

Getting in contact

The IRC channel on freenode is #gerrit. An archive is available at: echelog.com.

The Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Buck and run the following:

    git clone --recursive https://gerrit.googlesource.com/gerrit
    cd gerrit && buck build release

Install binary packages (Deb/Rpm)

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>]

Use pre-built Gerrit images on Docker

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.