Revert of Use tracking remote name for gerrit upload.

Revert of Use tracking remote name for gerrit upload. (patchset #1 id:1 of https://codereview.chromium.org/1830313002/ )

Reason for revert:
Argh, this has broken uploading track-ed branches.
Repro:

git new-branch base-feature
touch x1 && git add x1 && git commit -m "x1"
git cl upload
git new-branch --upstream_current dep-feature
touch y1 && git add y1 && git commit -m "y1"
git cl upload -v -v # fails.


the verbose output produces this:
---cut---
DEBUG:root:git push . 7079b1682431184375b62e7e81ce10a02171aa0d:refs/for/refs/heads/master
To .
 ! [rejected]        7079b1682431184375b62e7e81ce10a02171aa0d -> refs/for/refs/heads/master (non-fast-forward)
error: failed to push some refs to '.'
---cut---

Original issue's description:
> Use tracking remote name for gerrit upload.
> 
> This patch replaces the hard-coded remote name 'origin' with the
> one obtained by git-remote.
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299491

TBR=iannucci@chromium.org,ukai@chromium.org,alokp@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299509

[tandrii(chromium), 2016-03-28 15:41:46]

Created Revert of Use tracking remote name for gerrit upload.

[commit-bot: I haz the power, 2016-03-28 15:41:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1835923002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1835923002/1

[commit-bot: I haz the power, 2016-03-28 15:44:09]

Description was changed from

==========
Revert of Use tracking remote name for gerrit upload. (patchset #1 id:1 of
https://codereview.chromium.org/1830313002/ )

Reason for revert:
Argh, this has broken uploading track-ed branches.
Repro:

git new-branch base-feature
touch x1 && git add x1 && git commit -m "x1"
git cl upload
git new-branch --upstream_current dep-feature
touch y1 && git add y1 && git commit -m "y1"
git cl upload -v -v # fails.


the verbose output produces this:
---cut---
DEBUG:root:git push .
7079b1682431184375b62e7e81ce10a02171aa0d:refs/for/refs/heads/master
To .
 ! [rejected]        7079b1682431184375b62e7e81ce10a02171aa0d ->
refs/for/refs/heads/master (non-fast-forward)
error: failed to push some refs to '.'
---cut---

Original issue's description:
> Use tracking remote name for gerrit upload.
> 
> This patch replaces the hard-coded remote name 'origin' with the
> one obtained by git-remote.
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299491

TBR=iannucci@chromium.org,ukai@chromium.org,alokp@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
==========

to

==========
Revert of Use tracking remote name for gerrit upload. (patchset #1 id:1 of
https://codereview.chromium.org/1830313002/ )

Reason for revert:
Argh, this has broken uploading track-ed branches.
Repro:

git new-branch base-feature
touch x1 && git add x1 && git commit -m "x1"
git cl upload
git new-branch --upstream_current dep-feature
touch y1 && git add y1 && git commit -m "y1"
git cl upload -v -v # fails.


the verbose output produces this:
---cut---
DEBUG:root:git push .
7079b1682431184375b62e7e81ce10a02171aa0d:refs/for/refs/heads/master
To .
 ! [rejected]        7079b1682431184375b62e7e81ce10a02171aa0d ->
refs/for/refs/heads/master (non-fast-forward)
error: failed to push some refs to '.'
---cut---

Original issue's description:
> Use tracking remote name for gerrit upload.
> 
> This patch replaces the hard-coded remote name 'origin' with the
> one obtained by git-remote.
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299491

TBR=iannucci@chromium.org,ukai@chromium.org,alokp@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299509
==========

[commit-bot: I haz the power, 2016-03-28 15:44:10]

Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=299509

[tandrii(chromium), 2016-03-28 15:44:37]

https://codereview.chromium.org/1835923002/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/1835923002/diff/1/git_cl.py#newcode2465
git_cl.py:2465: remote, remote_branch = cl.GetRemoteBranch()
alokp@ I think the right fix is to actually check `remote` here, and if it's '.'
(meaning local branch), then go recursively to fetch remote of it, and so on
until remote isn't '.'.

[iannucci, 2016-03-28 16:36:38]

That sounds more right. I should have thought of that :(

On Mon, Mar 28, 2016, 08:44 <tandrii@chromium.org> wrote:

>
> https://codereview.chromium.org/1835923002/diff/1/git_cl.py
> File git_cl.py (right):
>
> https://codereview.chromium.org/1835923002/diff/1/git_cl.py#newcode2465
> git_cl.py:2465: remote, remote_branch = cl.GetRemoteBranch()
> alokp@ I think the right fix is to actually check `remote` here, and if
> it's '.' (meaning local branch), then go recursively to fetch remote of
> it, and so on until remote isn't '.'.
>
> https://codereview.chromium.org/1835923002/
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.