For blink changes, the git cl upload isn't working correctly for me with 'origin/master' at the end.

For blink changes, the git cl upload isn't working correctly for me with 'origin/master' at the end.

I'm clearly not a git expert. Is there a better solution? If not, I'll add a test to this one.

BUG=

Committed: https://crrev.com/e5b39b6089a5c704559fc1e9d27f6f3ef47e92ec
Cr-Commit-Position: refs/heads/master@{#292098}

[sullivan, 2014-08-26 20:26:37]

sullivan@chromium.org changed reviewers:
+ alancutter@chromium.org, tonyg@chromium.org

[sullivan, 2014-08-26 20:26:37]

Hi Alan and Tony,

I'm not an expert in git or rietveld, so suggestions for a better solution to
this error are welcome!

Without this change, I get the following error after making a blink change on a
branch and committing it:

ERROR: b518fae0cd65215bdbe6a554d470467cc0d42924 is not in the current branch. 
You may need to rebase your tracking branch\n\nGit sanity check failure

[tonyg, 2014-08-26 20:41:51]

https://codereview.chromium.org/469373006/diff/1/tools/telemetry/telemetry/co...
File tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
(right):

https://codereview.chromium.org/469373006/diff/1/tools/telemetry/telemetry/co...
tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py:98:
['git', 'checkout', '-b', 'telemetry-tryjob'])
You'll have to test, but I *think* the right fix might be to add 'origin/master'
to the end of this command in all cases and then revert the changes below.

[alancutter (OOO until 2018), 2014-08-27 00:08:45]

On 2014/08/26 20:41:51, tonyg wrote:
>
https://codereview.chromium.org/469373006/diff/1/tools/telemetry/telemetry/co...
> File tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
> (right):
> 
>
https://codereview.chromium.org/469373006/diff/1/tools/telemetry/telemetry/co...
> tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py:98:
> ['git', 'checkout', '-b', 'telemetry-tryjob'])
> You'll have to test, but I *think* the right fix might be to add
'origin/master'
> to the end of this command in all cases and then revert the changes below.

"git checkout -b telemetry-tryjob origin/master" will create the new branch
based at origin/master rather than the current branch with all its changes.

I think the right thing to do here is two step:
git checkout -b telemetry-tryjob
git branch --set-upstream-to origin/master

[sullivan, 2014-08-27 02:25:25]

On 2014/08/27 00:08:45, alancutter wrote:
> On 2014/08/26 20:41:51, tonyg wrote:
> >
>
https://codereview.chromium.org/469373006/diff/1/tools/telemetry/telemetry/co...
> > File tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
> > (right):
> > 
> >
>
https://codereview.chromium.org/469373006/diff/1/tools/telemetry/telemetry/co...
> > tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py:98:
> > ['git', 'checkout', '-b', 'telemetry-tryjob'])
> > You'll have to test, but I *think* the right fix might be to add
> 'origin/master'
> > to the end of this command in all cases and then revert the changes below.
> 
> "git checkout -b telemetry-tryjob origin/master" will create the new branch
> based at origin/master rather than the current branch with all its changes.
> 
> I think the right thing to do here is two step:
> git checkout -b telemetry-tryjob
> git branch --set-upstream-to origin/master

Thanks! I tested this manually, and it works in both cases AFAICT. New patchset
with unit tests ready for review.

[tonyg, 2014-08-27 02:29:11]

The CQ bit was checked by tonyg@chromium.org

[tonyg, 2014-08-27 02:29:11]

lgtm

[commit-bot: I haz the power, 2014-08-27 02:30:04]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/sullivan@chromium.org/469373006/20001

[commit-bot: I haz the power, 2014-08-27 03:29:21]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_chromium_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[commit-bot: I haz the power, 2014-08-27 04:47:08]

Committed patchset #2 (20001) as a9b9b7f0370c9dc7c866a89f9e26c79d30f137e9

[commit-bot: I haz the power, 2014-09-10 02:49:45]

Patchset 2 (id:??) landed as
https://crrev.com/e5b39b6089a5c704559fc1e9d27f6f3ef47e92ec
Cr-Commit-Position: refs/heads/master@{#292098}