From fea4fadeda594a811ddc80036cf39ef67cfe10c9 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 12:00:11 +0100
Subject: [PATCH] build: use --keep-non-patch flag with git am (#48806)

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
---
 script/lib/git.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/lib/git.py b/script/lib/git.py
index 68789d8add..55a3a560be 100644
--- a/script/lib/git.py
+++ b/script/lib/git.py
@@ -52,7 +52,8 @@ def get_repo_root(path):
 
 def am(repo, patch_data, threeway=False, directory=None, exclude=None,
     committer_name=None, committer_email=None, keep_cr=True):
-  args = []
+  # --keep-non-patch prevents stripping leading bracketed strings on the subject line
+  args = ['--keep-non-patch']
   if threeway:
     args += ['--3way']
   if directory is not None: