My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 1030: Pushing new branch automatically merges un-peer reviewed code to branch.
5 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by drag...@gmail.com, Jun 30, 2011
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.
Aug 19, 2011
#2 drag...@gmail.com
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.
Sign in to add a comment

Powered by Google Project Hosting