search

CandyShop / gerrit

Automatically exported from code.google.com/p/gerrit
Apache License 2.0
1 stars 0 forks source link

Pushing new branch automatically merges un-peer reviewed code to branch. #1030

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
Affected Version: 2.2.1

What steps will reproduce the problem?
1. Make a change to master and commit locally.
2. Push change for peer review ($ git push origin HEAD:refs/for/master)
3. Create new Branch from local master ($ git push origin 
master:refs/heads/newBranch)

What is the expected output?

  Code change pushed in 2 should still be up for peer review (not automatically merged), ideally on the branch and on master, but at least on the branch.  

  Branch should branch from master at the last merged commit (or it should be pending and have the ability through the web UI to merge it when the unmerged commits are merged normally).

What do you see instead?

  The change is marked as merged and the branch is master in the Gerrit web UI for the change.

Please provide any additional information below.

  A git pull or get fetch does not update the local git with the changes (the changes in the local repo show up as changes on remotes/origin/newBranch, not on master).

  Users do not have the push branch permissions (just create branch), so they shouldn't be able to get around this using the technique above.

Original issue reported on code.google.com by drag...@gmail.com on 30 Jun 2011 at 6:54

GoogleCodeExporter commented 9 years ago 
Is this the same as http://code.google.com/p/gerrit/issues/detail?id=635 ?

Original comment by sascha.s...@gmail.com on 19 Aug 2011 at 10:03

GoogleCodeExporter commented 9 years ago 
It looks like a similar issue, except that issue 635 is fixed in 2.1.7 and this 
is an issue in version 2.2.1.

Original comment by drag...@gmail.com on 19 Aug 2011 at 1:23