Issue 2427: Gerrit should warn if submit would cause multiple commits to be merged
Status:  New
Owner: ----
Reported by weiwan...@gmail.com, Jan 24, 2014
************************************************************
***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW *****
***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL *****
***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC.    *****
***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS!  *****
************************************************************

Affected Version:

What steps will reproduce the problem?
1. Set submit type to "Rebase if necessary"
2. Have Branch1 and Branch2 in one project, where Branch2 is multiple commits "ahead" of Branch1.
3. User's local branch, which is based on Branch2 is accidentally pushed to refs/for/Branch1 instead of refs/for/Branch2.
4. Reviewer does not notice the incorrect branch, and approves + submits the patch.

What is the expected output? What do you see instead?

I expect Gerrit to warn me when this happens.

Instead, Gerrit fast-forwards Branch1 to Branch2. Essentially it merges ALL Branch2 commits plus the new one that was just submitted into Branch1.

Gerrit should just warn that "You are about to fast-forward Branch1 X commits" as long as X is greater than 1.
Jan 24, 2014
#1 weiwan...@gmail.com
This has happened to us twice so far. Both times I had to do hard resets and push --force in a hurry to rectify the situation.