Google Git
Sign in
gerrit / gerrit / fcfb671681fd574899bb654c3f3efbf0b4c66286
commitfcfb671681fd574899bb654c3f3efbf0b4c66286[log] [tgz]
authorYoussef Elghareeb <ghareeb@google.com>Mon Mar 15 16:50:38 2021 +0100
committerYoussef Elghareeb <ghareeb@google.com>Mon Mar 15 16:50:38 2021 +0100
tree8c310a0b6941a0ab5c1fcb8f584d4bd1e3fd90a5
parent586d48f57e1b6d56c647042327b1e49609705cc1 [diff]
Fix auto-merge detection in new diff cache

Fixing a tiny programming error in detecting comparison type in new diff
cache. If base commit is the auto-merge, the auto-merge prefix
appears in the actual commit message, not on the first line of the
commit text.

==
Merge Of:   a5ad51e2 (parent 1)
            aa00dd3f (parent 2)
Author:     User <user@domain>
AuthorDate: 2021-03-15 15:52:37 +0000
Commit:     User <user@domain>
CommitDate: 2021-03-15 15:52:37 +0000

Auto-merge of 1032ed12234a41b350531bfb5717f3079a243c36
==

Hence changing the implementation to look at the whole commit text
instead.

Change-Id: Iafed7bf7329be14ed151555c588d2a42e94695d7
2 files changed
tree: 8c310a0b6941a0ab5c1fcb8f584d4bd1e3fd90a5
  1. .settings/
  2. .ts-out/
  3. antlr3/
  4. contrib/
  5. Documentation/
  6. e2e-tests/
  7. java/
  8. javatests/
  9. lib/
  10. modules/
  11. plugins/
  12. polygerrit-ui/
  13. prolog/
  14. prologtests/
  15. proto/
  16. resources/
  17. tools/
  18. webapp/
  19. polymer-bridges
  20. .bazelignore
  21. .bazelproject
  22. .bazelrc
  23. .bazelversion
  24. .editorconfig
  25. .git-blame-ignore-revs
  26. .gitignore
  27. .gitmodules
  28. .gitreview
  29. .mailmap
  30. .pydevproject
  31. .zuul.yaml
  32. BUILD
  33. COPYING
  34. INSTALL
  35. Jenkinsfile
  36. package.json
  37. README.md
  38. SUBMITTING_PATCHES
  39. version.bzl
  40. WORKSPACE
  41. yarn.lock
README.md

Gerrit Code Review

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

Build Status Maven Central

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 Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Bazel and run the following:

    git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
    cd gerrit && bazel 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 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.