Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: tools/git-sync-deps

Issue 1475513004: tools/git-sync-deps: handle changing origin (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/git-sync-deps
diff --git a/tools/git-sync-deps b/tools/git-sync-deps
index 92adf4e855483807b8ebeed89a155451462b9fee..c99ae9120727abdd17a3163743d0506f0c57e10c 100755
--- a/tools/git-sync-deps
+++ b/tools/git-sync-deps
@@ -142,8 +142,11 @@ def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
subprocess.check_call([git, 'fetch', '--quiet'], cwd=directory)
- subprocess.check_call(
- [git, 'checkout', '--quiet', checkoutable], cwd=directory)
+ if 0 != subprocess.call(
+ [git, 'checkout', '--quiet', checkoutable], cwd=directory):
+ subprocess.check_call([git, 'remote', 'set-url', repo], cwd=directory)
+ subprocess.check_call([git, 'fetch', '--quiet'], cwd=directory)
+ subprocess.check_call([git, 'checkout', '--quiet'], cwd=directory)
if verbose:
sys.stdout.write('%s\n @ %s\n' % (directory, checkoutable)) # Success.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698