commit 6f896d0bfc2771d133dfbe8623651a8e00c5ada1
author Josip Sokcevic <sokcevic@google.com> Mon Aug 09 23:29:37 2021 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 09 23:29:37 2021 +0000
tree db683050ccbf66b67c1ae32e065ed310842dfe2a
parent 7ecdc98e22588930c2b6e01fc1571d257dbb27e4

Set main as default branch for git_cache

Currently, git cache depends on the global default branch. Set it to
main explicitly instead.

Bug: 3082645, b/195975120
Change-Id: Ia9331d479dbe9547b6913c74bbf86852fff3a596
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3083251
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Anthony Polito <apolito@google.com>

git_cache.py

diff --git a/git_cache.py b/git_cache.py
index 9a4bed9..9c21067 100755
--- a/git_cache.py
+++ b/git_cache.py
@@ -302,7 +302,7 @@
     try:
       # create new temporary directory locally
       tempdir = tempfile.mkdtemp(prefix='_cache_tmp', dir=self.GetCachePath())
-      self.RunGit(['init', '--bare'], cwd=tempdir)
+      self.RunGit(['init', '--bare', '-b', 'main'], cwd=tempdir)
       self.print('Downloading files in %s/* into %s.' %
                  (latest_dir, tempdir))
       with self.print_duration_of('download'):
@@ -410,7 +410,7 @@
         # 1. No previous cache.
         # 2. Project doesn't have a bootstrap folder.
         # Start with a bare git dir.
-        self.RunGit(['init', '--bare'], cwd=self.mirror_path)
+        self.RunGit(['init', '--bare', '-b', 'main'], cwd=self.mirror_path)
       else:
         # Bootstrap failed, previous cache exists; warn and continue.
         logging.warning(