gclient_scm.py - Issue 244253007: Fix gclient to correctly check out remote refs during update.

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: gclient_scm.py

Issue 244253007: Fix gclient to correctly check out remote refs during update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Fix comment Created 6 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: gclient_scm.py

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

index c0b4a325e9262c49df14e7d4c5356a7de430f2c6..54e550e25522fd82494661b921b1b435ab17d913 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -341,8 +341,8 @@ class GitWrapper(SCMWrapper):

if revision.startswith('refs/'):

rev_type = "branch"

elif revision.startswith(self.remote + '/'):

- # For compatibility with old naming, translate 'origin' to 'refs/heads'

- revision = revision.replace(self.remote + '/', 'refs/heads/')

+ # Rewrite remote refs to their local equivalents.

+ revision = 'refs/remotes/' + revision

rev_type = "branch"

else:

# hash is also a tag, only make a distinction at checkout

« no previous file with comments | « no previous file | no next file » | no next file with comments »