New issue
Advanced search Search tips

Issue 718124 link

Starred by 1 user

Issue metadata

Status: WontFix
Owner: ----
Closed: Jun 2017
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: ----
Type: Bug


Previous locations:
gerrit:6019


Sign in to add a comment

git cl upload --gerrit uploads everything

Project Member Reported by enne@chromium.org, Apr 17 2017

Issue description

I tried to upload https://chromium-review.googlesource.com/c/479893/ 

For some reason the uploader thinks I'm trying to upload 167478 files.  Upstream here is set correctly and 'git diff @{u}' is reasonable and only includes the three files I changed.

git cl upload --gerrit says:
--snip--
remote: Replicating objects... done        
remote: Processing changes: new: 1 (/)
To https://chromium.googlesource.com/chromium/src.git
 ! [remote rejected]           ab613d1d93382977423af08c5c6868b1ba6320f7 -> refs/for/refs/heads/master%m=Initial_upload,notify=NONE (error in Gerrit backend)
error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git'

Error after CL description prompt -- saving description to /usr/local/google/home/enne/.git_cl_description_backup

Failed to create a change. Please examine output above for the reason of the failure.
Hint: run command below to diangose common Git/Gerrit credential problems:
  git cl creds-check
--snip--

git log says:
--snip--
commit 4dd752f15e24376867803c19f2cece3589185827 (HEAD -> fix_print_crash)
Author: Adrienne Walker <enne@chromium.org>
Date:   Mon Apr 17 15:24:37 2017 -0700

    moar tests

commit 425eeff921e2a110712cf1410651a2e68a65fa7a
Author: Adrienne Walker <enne@chromium.org>
Date:   Mon Apr 17 15:04:51 2017 -0700

    Initial fix

commit fa0a83ccea48b98b3c8a7facd068a41bc92f21f1 (origin/master, origin/HEAD, master)
Author: sky <sky@chromium.org>
Date:   Mon Apr 17 15:48:48 2017 -0700

    Makes functions in container_finder take aura::Window
    
    BUG= 687656 
    TEST=covered by tests
    R=msw@chromium.org
    
    Review-Url: https://codereview.chromium.org/2826453003
    Cr-Commit-Position: refs/heads/master@{#465049}
--snip--
 

Comment 1 by enne@chromium.org, Apr 18 2017

Ahaha ok, I figured it out.  A long time ago, I fumbled and accidentally created an "origin/master" branch that a git worktree referred to.

git cl upload --gerrit attempted to find the upstream branch by name but not by @{u} and so attempted to upload changes based on this ancient branch called "origin/master" that happened to have the same name as origin/master.
Labels: Milestone-Turndown Proj-Gerrit-Migration
Status: Accepted (was: New)
Summary: git cl upload should upload against @{u} (was: git cl upload --gerrit uploads everything)
We don't currently target @{u} because doing so requires a lot of slow calls. We'd love to rip the guts out of git-cl-upload, and make it sane both in implementation and in api, but we can't really do that until Rietveld is turned down and we can delete all the code for that.

In the mean time, having a local branch called "origin/master" is super rare, so we're not going to specifically work around that case for now.
Project: chromium
Moved issue gerrit:6019 to now be  issue chromium:718124 .

Comment 4 by aga...@chromium.org, Jun 27 2017

Status: WontFix (was: New)

Sign in to add a comment