git_cl.py - Issue 1110293002: Make git cl upload correctly track upstream refs when uploading to Gerrit

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_cl.py

Issue 1110293002: Make git cl upload correctly track upstream refs when uploading to Gerrit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: git_cl.py

diff --git a/git_cl.py b/git_cl.py

index d4486e5b10abd24e0667f0b6509695950029660d..12b59216e2a27d94b47f68bb772f3c50e58b1ba8 100755

--- a/git_cl.py

+++ b/git_cl.py

@@ -1702,9 +1702,10 @@ def GerritUpload(options, args, cl, change):

# We assume the remote called "origin" is the one we want.

# It is probably not worthwhile to support different workflows.

gerrit_remote = 'origin'

- branch = 'master'

- if options.target_branch:

- branch = options.target_branch

+ remote, remote_branch = cl.GetRemoteBranch()

+ branch = GetTargetRef(remote, remote_branch, options.target_branch,

+ pending_prefix='')

change_desc = ChangeDescription(

options.message or CreateDescriptionFromLog(args))

« no previous file with comments | « no previous file | tests/git_cl_test.py » ('j') | tests/git_cl_test.py » ('J')