From 7815620b1fc90605b76dacbd2d128460d3743184 Mon Sep 17 00:00:00 2001 From: Allen Li Date: Thu, 1 Aug 2024 21:30:12 +0000 Subject: [PATCH] [git_auth] Auto configure global config also Bug: b/351071334 Change-Id: I069443a74cf7e33ce9ebea53ea3d52e272ed3570 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5740605 Commit-Queue: Allen Li Reviewed-by: Yiwei Zhang --- git_auth.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/git_auth.py b/git_auth.py index 8ddb63483a..a4f7e467d5 100644 --- a/git_auth.py +++ b/git_auth.py @@ -243,7 +243,7 @@ def AutoConfigure(cwd: str, cl: git_cl.Changelist) -> None: logging.debug( 'Automatically configuring Git repo authentication' ' (current version: %r, latest: %r)', v, latestVer) - ConfigureRepo(cwd, cl) + Configure(cwd, cl) scm.GIT.SetConfig(cwd, 'depot-tools.gitAuthAutoConfigured', str(latestVer)) @@ -278,13 +278,6 @@ def Configure(cwd: str, cl: git_cl.Changelist) -> None: c2.apply(cwd) -def ConfigureRepo(cwd: str, cl: git_cl.Changelist) -> None: - """Configure the current Git repo authentication.""" - logging.debug('Configuring current Git repo authentication...') - c = ConfigChanger.new_from_env(cwd, cl) - c.apply(cwd) - - def ClearRepoConfig(cwd: str, cl: git_cl.Changelist) -> None: """Clear the current Git repo authentication.""" logging.debug('Clearing current Git repo authentication...')