Affected Version: 2.8.4
- What steps will reproduce the problem?
You need to have the following situation in Gerrit:
A---C---E => master (merged)
\ \
\ D => master (approved, but not merged)
\ /
B => feature (merged)
A new feature was developed in the feature branch (B) then merged with master branch (C) and pushed to master branch to review (D). When the change was approved and ready to be submitted there was a new commit on master branch (E).
- What is the expected output? What do you see instead?
When "Submit" button is clicked it was expected 2 possible scenarios:
1. Gerrit executes a "git rebase" (without --preserve-merges option):
A---C---E---D' => master
\
B => feature
D' should be a new patchset of the original change
2. Gerrit executes a "git rebase --preserve-merges":
A---C---E---D' => master
\ /
B-------/ => feature
Again, D' should be a new patchset of the original change
But... actually this is what we got:
A---C---E---D' => master
\ \ /
\ D---/
\ /
B => feature
Notes:
- D' is NOT a new patchset of the original change
- There's no "Patch Set x was rebased" message in the original change