From 4ea67bbd15c5faffad4797a3dadde6d69f5f36fa Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Tue, 20 Apr 2021 17:33:52 +0000 Subject: [PATCH] gclient: Map origin/foo to refs/remotes/origin/foo Bug: 1200657 Change-Id: Ib719b984a71cd944bbccf3ec7065aaa17f60e638 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2838026 Reviewed-by: Gavin Mak Commit-Queue: Edward Lesmes --- gclient_scm.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gclient_scm.py b/gclient_scm.py index 8a3410a88..4407ea961 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -488,6 +488,8 @@ class GitWrapper(SCMWrapper): # If a dependency is not pinned, track the default remote branch. revision = scm.GIT.GetRemoteHeadRef(self.checkout_path, self.url, self.remote) + if revision.startswith('origin/'): + revision = 'refs/remotes/' + revision if managed: self._DisableHooks()