RETIRED, Gerrit as used by OpenStack
72fa3c2422
This behavior is caused by submitting a commit that has a tag.
Method MergeUtil.markCleanMerges is used by each merge strategy
to update the status of a change if it was a clean merge. It skips
commits that are identified as accepted and their entire ancestry
chain. If a commit is tagged, method MergeOp.getAlreadyAccepted
identifies it as accepted (even if it is not merged yet).
Fix prevents a commit that is referred by a tag to be included in
alreadyAccepted set. If such commit is already merged then it will
be covered anyway by adding heads to alreadyAccepted.
Add a corresponding test that pushes a commit with a tag
Bug: Issue 600
Change-Id: If00247b809b985eaf60ef5ef09fad0f475fb06b9
(cherry picked from commit
|
||
|---|---|---|
| contrib | ||
| Documentation | ||
| gerrit-acceptance-tests | ||
| gerrit-antlr | ||
| gerrit-cache-h2 | ||
| gerrit-common | ||
| gerrit-extension-api | ||
| gerrit-gwtdebug | ||
| gerrit-gwtexpui | ||
| gerrit-gwtui | ||
| gerrit-httpd | ||
| gerrit-launcher | ||
| gerrit-main | ||
| gerrit-openid | ||
| gerrit-patch-commonsnet | ||
| gerrit-patch-jgit | ||
| gerrit-pgm | ||
| gerrit-plugin-api | ||
| gerrit-plugin-archetype | ||
| gerrit-plugin-gwt-archetype | ||
| gerrit-plugin-gwtui | ||
| gerrit-plugin-js-archetype | ||
| gerrit-prettify | ||
| gerrit-reviewdb | ||
| gerrit-server | ||
| gerrit-sshd | ||
| gerrit-util-cli | ||
| gerrit-util-ssl | ||
| gerrit-war | ||
| plugins | ||
| ReleaseNotes | ||
| tools | ||
| .gitignore | ||
| .gitmodules | ||
| COPYING | ||
| INSTALL | ||
| pom.xml | ||
| SUBMITTING_PATCHES | ||