New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 622761 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jul 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment

Gerrit rejects my merge: [remote rejected] (prohibited by Gerrit)

Project Member Reported by olka@chromium.org, Jun 23 2016

Issue description

I was added to chromium committers ~3 weeks ago.

Merging cherry pick to M52, getting this error:

Cherry-picking commit on top of pending ref...
Pushing commit to refs/pending/branch-heads/2743... It can take a while.
Push failed with exit code 1.
To https://chromium.googlesource.com/chromium/src.git
!	HEAD:refs/pending/branch-heads/2743	[remote rejected] (prohibited by Gerrit)
Done
Fatal push error. Make sure your .netrc credentials and git user.email are correct and you have push access to the repo.
Failed to push. If this persists, please file a bug.
Error: Command 'cl land --bypass-hooks' failed: Command '['git', 'cl', 'land', '--bypass-hooks']' returned non-zero exit status 1

 

Comment 1 by benhenry@google.com, Jun 23 2016

Components: -Infra Infra>Git>Admin
Should be in the Git Admin rotation. Next time, use go/fix-chrome-git
Cc: benhenry@chromium.org
Status: Fixed (was: Untriaged)
You weren't added to Gerrit's group of committers. Can you try again?
And thanks for filing a bug.
Owner: tandrii@chromium.org

Comment 4 by olka@chromium.org, Jun 27 2016

Thanks a lot!
I'll try next time I need a merge, now a colleague did it for me. 

Comment 5 by olka@chromium.org, Jul 1 2016

Status: Assigned (was: Fixed)
Same problem again. What else can be wrong?
tell me these things:

a) cd <from where you run git push> && git config user.email
ideally, it should be olka@chromium.org

b) what's in your ~/.netrc or ~/.gitcookies for chromium.googlesource.com domain,
DO NOT COPY_PASTE IT AS IS, because the last part is your secret token. Edit it out, and then paste for me to see. 
ideally, it should be smth like:

machine chromium.googlesource.com login git-olka.chromium.org password XXXXXXXXXX

Comment 7 by olka@chromium.org, Jul 1 2016

a) yes
b) ok, it's something weird:
chromium.googlesource.com       FALSE   /       TRUE    [some number]      o       git-olka.webrtc.org=XXXXXXXXXXXXX

and I also have this
.googlesource.com       TRUE    /       TRUE    [some number]      o       git-olka.chromium.org=YYYYYYYYYYYYYYYYYYY
Comment out webrtc line and the *.googlesource.com domain should be used, and you'd be able to commit. Can you try and LMK how it went?

Comment 9 by olka@chromium.org, Jul 1 2016

Thanks, I'll do it next time again - that merge is already committed by my colleague.

Comment 10 by olka@chromium.org, Jul 1 2016

Status: Fixed (was: Assigned)
Unfortunately, I don't have a very good solution for you wrt to how to directly push to webrtc and to chromium at the same time. Perhaps manual comment before pushing into chromium can suffice for now?

Or if you almost always use CQ to commit to webrtc, you can just keep the line commented, because fetching webrtc source can be done with chromium just fine.

Comment 12 by olka@chromium.org, Jul 1 2016

I see. Thank you!
BTW what is the right symbol for commenting out? :)
# this is a comment

Comment 14 by olka@chromium.org, Jul 1 2016

That was my guess. Thanks!

Sign in to add a comment