Problems with new workflow: Unable to determine default branch to diff against

[Jason Glasgow]

I've twice had this problem.

repo start nxxxxxx xxxx-firmware

<edit>

git add

git commit

git cl upload

I then am presented with the error:

jglinux1:xxxx-firmware(nxxxxxx) jglasgow$ git cl upload

Unable to determine default branch to diff against.

Either pass complete "git diff"-style arguments, like

  git cl upload origin/master

or verify this branch is set up to track another (via the --track argument to

"git checkout -b ...").

jglinux1:~ jglasgow$ 

If I try

git cl upload cros/master

then I get a little further.  It fires up an editor an allows me to edit the CL description, but after editing the description it dies again with the same message.

-Jason

[Jason Glasgow]

From the proper email address. -Jason

[Chris Sosa]

I think the problem your having is that you ran msb's original command
about doing the find / sed to fix git pushes. I had followed his
instructions and then started having the problem as well. I think the
way to fix this would be to re-run the command switching the items in
the sed statement and then run his updated command. I haven't tried
it yet myself but will try it when I get in.

> --
> Chromium OS Developers mailing list: chromiu...@chromium.org
> View archives, change email options, or unsubscribe:
> http://groups.google.com/a/chromium.org/group/chromium-os-dev?hl=en
>

[Jason Glasgow]

Thanks.  I ran msb's updated command (at least I think I did).

I was able to fix my problem by adding:

remote = cros

merge = refs/heads/master

to my branch in the .git/config file.

-Jason