Preserve author of submodule commits for super repo commit

If a super-repo is subscribed to 2 submodules and both submodules get
updated together by submitting a topic, a single commit in the
super-repo is created that updates both submodules at once. If the
commits in the submodules had the same author it was intended to
preserve this author for the super-repo commit. However when the authors
of the submodule commits were compared the author timestamp was taken
into account and as result the authors were (almost) never equal. Due to
this we were falling back to using the Gerrit server identity as author
for the commit in the super-repo. This is now fixed by ignoring the
author timestamp when comparing the authors.

Change-Id: I3130d29cb50abaf82e808523519d8743227e09d5
Signed-off-by: Edwin Kempin <ekempin@google.com>
3 files changed
tree: 2c70e200cb08fb110cbde05bd742eaba66e217ca
  1. .settings/
  2. antlr3/
  3. contrib/
  4. Documentation/
  5. gerrit-gwtdebug/
  6. gerrit-gwtui/
  7. gerrit-gwtui-common/
  8. gerrit-plugin-gwtui/
  9. java/
  10. javatests/
  11. lib/
  12. plugins/
  13. polygerrit-ui/
  14. prolog/
  15. prologtests/
  16. proto/
  17. resources/
  18. tools/
  19. webapp/
  20. .bazelproject
  21. .editorconfig
  22. .git-blame-ignore-revs
  23. .gitignore
  24. .gitmodules
  25. .mailmap
  26. .pydevproject
  27. 0001-Replace-native-http-git-_archive-with-Skylark-rules.patch
  28. 0002-Bump-Dagger-to-2.14.1-to-support-Java-9.patch
  29. BUILD
  30. COPYING
  31. INSTALL
  32. README.md
  33. SUBMITTING_PATCHES
  34. version.bzl
  35. 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 Bazel and run the following:

    git clone --recursive 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 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.