commit 13225b70bc0da1fbbd198531992db97dfa1eb19a
author Josip Sokcevic <sokcevic@google.com> Thu Oct 14 22:24:00 2021 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 14 22:24:00 2021 +0000
tree 58f2528d00381add78bba3a7e24594cfcee1cc07
parent 0bce062fb3390401de836164c1a007fdf8c83720

Force set HEAD to refs/heads/main for git_cache

We only build git_cache if main branch exists, and newly boostrap caches
have main as default. This sets HEAD for already boostrapped caches, in
case they were boostrapped before the default branch change.

R=gavinmak@google.com

Bug: 1251783
Change-Id: I715329ee06cf523f9fe2e6a324381dc5703bac34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3218281
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>

git_cache.py

diff --git a/git_cache.py b/git_cache.py
index a76816d..82a3108 100755
--- a/git_cache.py
+++ b/git_cache.py
@@ -390,6 +390,10 @@
       if depth and os.path.exists(os.path.join(self.mirror_path, 'shallow')):
         logging.warning(
             'Shallow fetch requested, but repo cache already exists.')
+      # Old boostraps may have old default HEAD, so this ensures main is always
+      # used.
+      self.RunGit(['symbolic-ref', 'HEAD', 'refs/heads/main'],
+                  cwd=self.mirror_path)
       return
 
     if not self.exists():