From 9f0e78e146d24a80e93853686f32b2ca3a1fce36 Mon Sep 17 00:00:00 2001
From: Allen Li <ayatane@chromium.org>
Date: Wed, 26 Jun 2024 21:37:33 +0000
Subject: [PATCH] [git_cl] Append extra credential helper option

Bug: b/348024314
Change-Id: Ic7e1682812edcac878565bd79f002b40c018d95c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5655833
Commit-Queue: Allen Li <ayatane@chromium.org>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
---
 git_cl.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/git_cl.py b/git_cl.py
index d7b822804..ed77e7930 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3627,7 +3627,10 @@ def ConfigureGitRepoAuth() -> None:
                           f'credential.{gerrit_host}.helper',
                           '',
                           modify_all=True)
-        scm.GIT.SetConfig(cwd, f'credential.{gerrit_host}.helper', 'luci')
+        scm.GIT.SetConfig(cwd,
+                          f'credential.{gerrit_host}.helper',
+                          'luci',
+                          append=True)
 
     # Override potential global gitcookie config
     scm.GIT.SetConfig(cwd, 'http.gitcookies', '', modify_all=True)