gclient_scm.py - Issue 11417059: Reset to correct version when switching upstream repository for a git dependency.

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 11417059: Reset to correct version when switching upstream repository for a git dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 1 month 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 eb880c8959d5be039a5195a444e8015111028e94..dfbcb172b99e19094b979929f287042f0d59aa80 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -314,7 +314,7 @@ class GitWrapper(SCMWrapper):

if not options.verbose:

quiet = ['--quiet']

self._Run(['fetch', 'origin', '--prune'] + quiet, options)

- self._Run(['reset', '--hard', 'origin/master'] + quiet, options)

+ self._Run(['reset', '--hard', revision] + quiet, options)

self.UpdateSubmoduleConfig()

files = self._Capture(['ls-files']).splitlines()

file_list.extend([os.path.join(self.checkout_path, f) for f in files])

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