Google Git
Sign in
gerrit / gerrit / 3502500a4507485130a7e8e20047d5ee9c16b498
commit3502500a4507485130a7e8e20047d5ee9c16b498[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Wed Nov 23 14:37:30 2022 +0100
committerEdwin Kempin <ekempin@google.com>Wed Nov 23 14:42:16 2022 +0100
tree2e6f1898f45b9b44b23c45462ba8516d52a8f842
parent31787a5037d964812859174b4c063b6d8ccfcb7d [diff]
Fix ISE when user provides an ambiguous base revision

If the user specifies an abbreviated SHA1 as the base revision e.g. when
creating a branch, it may happen that the SHA1 is ambiguous and hence
cannot be resolved. In this case we should not fail with a 500 Internal
Server Error, but reject the request with a proper error message.

No test, since I don't know how to create ambiguous revisions in a test.

Looking at our logs we can see that this is happening:

org.eclipse.jgit.errors.AmbiguousObjectException: Object abbreviation 74568 is ambiguous
  at org.eclipse.jgit.lib.Repository.resolveAbbreviation(Repository.java:920)
  at org.eclipse.jgit.lib.Repository.resolveSimple(Repository.java:848)
  at org.eclipse.jgit.lib.Repository.resolve(Repository.java:813)
  at org.eclipse.jgit.lib.Repository.resolve(Repository.java:472)
  at com.google.gerrit.server.project.RefUtil.parseBaseRevision(RefUtil.java:43)
  at com.google.gerrit.server.restapi.project.CreateBranch.apply(CreateBranch.java:127)
  at com.google.gerrit.server.restapi.project.CreateBranch.apply(CreateBranch.java:61)
  ...

Release-Notes: skip
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I45a366dd39e081305d83d0151557e9d609327e2e
1 file changed
tree: 2e6f1898f45b9b44b23c45462ba8516d52a8f842
  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. web-dev-server.config.mjs
  41. WORKSPACE
  42. 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.