Google Git
Sign in
gerrit / gerrit / 9d16b6b0e3e62a40c8c73c8ebcbecb6f9779bb44
commit9d16b6b0e3e62a40c8c73c8ebcbecb6f9779bb44[log] [tgz]
authorZhen Chen <czhen@google.com>Thu Nov 17 12:27:28 2016 -0800
committerZhen Chen <czhen@google.com>Tue Dec 06 14:00:35 2016 -0800
tree80fd261f4855fdacd00a67a282db6fe20eeae2c4
parentf9937b173bc2e402516ecaf86920cff01ae0790d [diff]
RebaseAlways does not handle identical tree properly

In RebaseAlways if a commit can be fast forwarded, it will still modify
the commit message, however, MergeUtil.createCherryPickFromCommit can
throw a MergeIdenticalTreeException, in this case, we will not get a
new commit, and will fail at sanity check in
SubmitStrategyListener.findUnmergedChanges.

Note that RebaseIfNecessary will behave different by moving the branch
tip to the commit, it also make sense to make an empty rebase commit and
move the branch to it in RebaseAlways case.

Change-Id: Ia00b32a565031130534a3e25cf27d16af18c850f
6 files changed
tree: 80fd261f4855fdacd00a67a282db6fe20eeae2c4
  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-archetype/
  28. gerrit-plugin-gwt-archetype/
  29. gerrit-plugin-gwtui/
  30. gerrit-plugin-js-archetype/
  31. gerrit-prettify/
  32. gerrit-reviewdb/
  33. gerrit-server/
  34. gerrit-sshd/
  35. gerrit-util-cli/
  36. gerrit-util-http/
  37. gerrit-util-ssl/
  38. gerrit-war/
  39. lib/
  40. plugins/
  41. polygerrit-ui/
  42. ReleaseNotes/
  43. tools/
  44. website/
  45. .bazelproject
  46. .buckconfig
  47. .buckversion
  48. .editorconfig
  49. .gitignore
  50. .gitmodules
  51. .mailmap
  52. .pydevproject
  53. .watchmanconfig
  54. BUCK
  55. BUILD
  56. COPYING
  57. INSTALL
  58. README.md
  59. SUBMITTING_PATCHES
  60. version.bzl
  61. 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.