From 8b6ab36940109b058e67a1f58274088c80f291bf Mon Sep 17 00:00:00 2001 From: halcanary Date: Tue, 24 Nov 2015 13:10:52 -0800 Subject: tools/git-sync-deps: handle changing origin TBR=mtklein@google.com Review URL: https://codereview.chromium.org/1475513004 --- tools/git-sync-deps | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools/git-sync-deps') diff --git a/tools/git-sync-deps b/tools/git-sync-deps index 92adf4e855..c99ae91207 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. -- cgit v1.2.3