git cl upload taking a long time

[Jamie Walch]

I'm trying to upload a patch for review with git cl upload, and I'm
getting the following output after several minutes:

Loaded authentication cookies from /Users/jamiewalch/.codereview_upload_cookies
Running presubmit upload checks ...
checking long lines took a long time: 16633ms
checking tabs took a long time: 5327ms
checking stray whitespace took a long time: 6082ms
checking nsobjects took a long time: 3518ms
checking singletons took a long time: 4696ms

I've left the command running for over an hour with no further
progress. Any ideas what might be wrong? FWIW, I've recently switched
to the new git workflow, but this is not my first upload since doing
so. The previous one worked just fine IIRC.

Cheers,
Jamie

[Marc-Antoine Ruel]

That's probably because the upstream branch was wrong, so it looked over all the files in your checkout.

Make sure "git pull" does something sensible, then you're fine.

M-A

--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
   http://groups.google.com/a/chromium.org/group/chromium-dev

[Jamie Walch]

git pull works fine if I switch to the master branch first,
butcomplains otherwise. AFAIK, this has always been the case (I
alwaysswitch to trunk before pulling, then switch back and rebase).
Cheers,
Jamie

[Marc-Antoine Ruel]

Change your workflow, do one of either:

git checkout -b my_work_branch origin/trunk

or

git branch --set-upstream my_work_branch origin/trunk

You never need to switch to trunk to pull if you setup the upstream correctly. That's also necessary if you ever start to pipeline patches and track local branches.

M-A

Le 11 octobre 2011 10:45, Jamie Walch <jamie...@google.com> a écrit :

git pull works fine if I switch to the master branch first, but
complains otherwise. AFAIK, this has always been the case (I always
switch to trunk before pulling, then switch back and rebase).

Cheers,
Jamie

On Tue, Oct 11, 2011 at 10:20 AM, Marc-Antoine Ruel <mar...@chromium.org> wrote:

[Jamie Walch]

The first command works, so I'll use that in future. The second didn't
seem to help, but I've already worked around the problem on those
branches. Oddly enough, I've never used that second argument to "git
checkout -b" and this is the first time I've seen this problem. Even
on my Linux box, where I've also switched to the new workflow, it
hasn't been a problem.

Cheers,
Jamie

[Marc-Antoine Ruel]

Try:

git branch -v -v

It prints which branch is the upstream branch for each of your local branches. git cl tries uses an heuristic when no upstream branch is set but the heuristic will fail if you used something else than 'origin'.

M-A