| commit | dcc24e776fd2d52bb5773a13c0d645f494692e8d | [log] [tgz] |
|---|---|---|
| author | Thomas Draebing <thomas.draebing@sap.com> | Tue Mar 21 14:52:23 2023 +0100 |
| committer | Thomas Draebing <thomas.draebing@sap.com> | Mon Apr 03 09:56:13 2023 +0200 |
| tree | 4e5f03d57ea676f1c35ceddfcd8f70901dbe29d9 | |
| parent | a8ffc24b5ea7248c206fc04b4202e73769fa1d92 [diff] |
Fix creating changes in SubmoduleSubscriptionsWholeTopicMergeIT
In some tests in SubmoduleSubscriptionsWholeTopicMergeIT changes
were created on multiple branches and pushed together. The
intended commit tree should have been:
```
change1 change2
\ /
\ /
\ dev
\ /
master
```
But since the local HEAD was not reset to the master branch after
creating the dev branch and before creating the change pushed for
master, it looked like this:
```
change1 change2
\ /
\ /
dev
/
master
```
Change1 will be pushed and submitted to the master branch and
change2 to the dev branch. The submit was successful in these
cases and while the resulting commit tree might not look as
expected, the assertions only checked the new branch tips and
not whether the commit `dev` was pointing to was also implicitly
added to the master branch.
Release-Notes: skip
Change-Id: Ic6322ba93bc7ddc669955ad0cc55dd8309123f57
Gerrit is a code review and project management tool for Git based projects.
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.
For information about how to install and use Gerrit, refer to the documentation.
Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.
Please report bugs on the issue tracker.
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.
The Developer Mailing list is repo-discuss on Google Groups.
Gerrit is provided under the Apache License 2.0.
Install Bazel and run the following:
git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
cd gerrit && bazel build release
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>]
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.