Google Git
Sign in
gerrit/gerrit/61e9d58ac7dfbdd8af079b1ed9587381a03c5db3
commit
61e9d58ac7dfbdd8af079b1ed9587381a03c5db3
[log]
author
Edwin Kempin <ekempin@google.com>
Fri Jan 10 12:05:57 2025 +0000
committer
Edwin Kempin <ekempin@google.com>
Fri Jan 10 12:08:35 2025 +0000
tree
f3f63ca0f9e85fff4f516353cf80ffc996806af5
parent
2d247595519cecdfbc985c2f52c3d2a73da45487 [diff]
Store for revert commits that they do not contain conflicts

Revert commits are based on the commit that is being reverted and have
the same tree as the parent of the commit that is being reverted. This
means revert commits never contain any conflicts.

Storing conflict information for revisions has been added in change
I15e48ba87.

In this case ours/theirs in ConflictsInfo is not set, since the revision
was not created by performing a Git merge.

Bug: Google b/373350443
Release-Notes: skip
Change-Id: I2950ea744f3db52a70c1d3f90372a88940eb4487
Signed-off-by: Edwin Kempin <ekempin@google.com>
2 files changed
tree: f3f63ca0f9e85fff4f516353cf80ffc996806af5
  1. .github/
  2. .settings/
  3. .ts-out/
  4. antlr3/
  5. contrib/
  6. Documentation/
  7. e2e-tests/
  8. java/
  9. javatests/
  10. lib/
  11. modules/
  12. plugins/
  13. polygerrit-ui/
  14. prolog/
  15. prologtests/
  16. proto/
  17. resources/
  18. tools/
  19. webapp/
  20. polymer-bridges
  21. .bazelignore
  22. .bazelproject
  23. .bazelrc
  24. .bazelversion
  25. .editorconfig
  26. .git-blame-ignore-revs
  27. .gitignore
  28. .gitmodules
  29. .gitreview
  30. .mailmap
  31. .pydevproject
  32. .zuul.yaml
  33. BUILD
  34. COPYING
  35. INSTALL
  36. Jenkinsfile
  37. MODULE.bazel
  38. package.json
  39. README.md
  40. SUBMITTING_PATCHES
  41. version.bzl
  42. web-dev-server.config.mjs
  43. WORKSPACE
  44. 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.